diff --git a/config/application-dev.yml b/config/application-dev.yml index 7d3affe9..971f60dc 100644 --- a/config/application-dev.yml +++ b/config/application-dev.yml @@ -106,6 +106,14 @@ seata: server-addr: ${spring.cloud.nacos.server-addr} namespace: +# 监控中心配置 +monitor: + user: + name: ruoyi + password: 123456 + ui: + title: RuoYi-Cloud-Plus服务监控中心 + # 本地文件上传 file: domain: http://127.0.0.1:9300 diff --git a/config/application-prod.yml b/config/application-prod.yml index cfa430af..bdad6262 100644 --- a/config/application-prod.yml +++ b/config/application-prod.yml @@ -106,6 +106,14 @@ seata: server-addr: ${spring.cloud.nacos.server-addr} namespace: +# 监控中心配置 +monitor: + user: + name: ruoyi + password: 123456 + ui: + title: RuoYi-Cloud-Plus服务监控中心 + # 本地文件上传 file: domain: http://127.0.0.1:9300 diff --git a/config/ruoyi-monitor.yml b/config/ruoyi-monitor.yml deleted file mode 100644 index 1512ea88..00000000 --- a/config/ruoyi-monitor.yml +++ /dev/null @@ -1,10 +0,0 @@ -# 监控中心配置 -spring: - security: - user: - name: ruoyi - password: 123456 - boot: - admin: - ui: - title: RuoYi-Cloud-Plus服务监控中心 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index dd0a8593..7dc2817b 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -31,3 +31,14 @@ spring: refresh: true - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} refresh: true + +--- # 监控中心配置 +spring: + security: + user: + name: ${monitor.user.name} + password: ${monitor.user.password} + boot: + admin: + ui: + title: ${monitor.ui.title} \ No newline at end of file diff --git a/sql/ry_config_20211118.sql b/sql/ry_config_20211118.sql index a028b7c3..04d81a5b 100644 --- a/sql/ry_config_20211118.sql +++ b/sql/ry_config_20211118.sql @@ -36,8 +36,6 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod (2,'application-dev.yml','DEFAULT_GROUP','# 将项目路径:config/下对应文件中内容复制到此处\n','80e38bff4ba7482da62a2803e550f6b2','2019-11-29 16:32:02','2021-11-30 12:04:02','','0:0:0:0:0:0:0:1','','','通用配置开发环境','null','null','yaml','null'), (3,'application-prod.yml','DEFAULT_GROUP','# 将项目路径:config/下对应文件中内容复制到此处\n','1774e05ccf3f4c73a1b9a8b17fde1f2d','2019-11-29 16:33:03','2021-11-30 12:05:03','','0:0:0:0:0:0:0:1','','','通用配置正式环境','null','null','yaml','null'), (4,'sentinel-ruoyi-gateway','DEFAULT_GROUP','# 将项目路径:config/下对应文件中内容复制到此处\n','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json','null'); -(5,'ruoyi-monitor.yml','DEFAULT_GROUP','# 将项目路径:config/下对应文件中内容复制到此处\n','d8997d0707a2fd5d9fc4e8409da38129','2020-11-20 00:00:00','2020-12-21 16:28:07',NULL,'0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','null'), - /******************************************/ /* 表名称 = config_info_aggr */