!582 优化admin配置文件读取

* update 优化admin监控配置读取名称
* update 优化admin监控配置读取

pom.xml

@@ -69,6 +69,8 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>local</profiles.active>
                 <logging.level>info</logging.level>
+                <monitor.username>ruoyi</monitor.username>
+                <monitor.password>123456</monitor.password>
             </properties>
         </profile>
         <profile>
@@ -77,6 +79,8 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
                 <logging.level>info</logging.level>
+                <monitor.username>ruoyi</monitor.username>
+                <monitor.password>123456</monitor.password>
             </properties>
             <activation>
                 <!-- 默认环境 -->
@@ -88,6 +92,8 @@
             <properties>
                 <profiles.active>prod</profiles.active>
                 <logging.level>warn</logging.level>
+                <monitor.username>ruoyi</monitor.username>
+                <monitor.password>123456</monitor.password>
             </properties>
         </profile>
     </profiles>

ruoyi-admin/src/main/resources/application-dev.yml

@@ -8,8 +8,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
+  username: @monitor.username@
-  password: 123456
+  password: @monitor.password@
 
 --- # snail-job 配置
 snail-job:

ruoyi-admin/src/main/resources/application-prod.yml

@@ -11,8 +11,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
+  username: @monitor.username@
-  password: 123456
+  password: @monitor.password@
 
 --- # snail-job 配置
 snail-job:

ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml

@@ -13,8 +13,8 @@ logging:
 spring:
   security:
     user:
-      name: ruoyi
+      name: @monitor.username@
-      password: 123456
+      password: @monitor.password@
   boot:
     admin:
       ui:
@@ -44,5 +44,5 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
+  username: @monitor.username@
-  password: 123456
+  password: @monitor.password@

ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml

@@ -46,5 +46,5 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
+  username: @monitor.username@
-  password: 123456
+  password: @monitor.password@

ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml

@@ -46,5 +46,5 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
+  username: @monitor.username@
-  password: 123456
+  password: @monitor.password@