From 4385da82e4071fc2241df9a6cdd656d51662e9ca Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: Wed, 4 Sep 2024 10:04:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96admin=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E9=85=8D=E7=BD=AE=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  9 +++++++++
 ruoyi-admin/src/main/resources/application-dev.yml     |  6 +++---
 ruoyi-admin/src/main/resources/application-prod.yml    |  6 +++---
 .../src/main/resources/application.yml                 | 10 +++++-----
 .../src/main/resources/application-dev.yml             |  6 +++---
 .../src/main/resources/application-prod.yml            |  6 +++---
 6 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index e32b113dc..526630aee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,9 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>local</profiles.active>
                 <logging.level>info</logging.level>
+                <admin.server>http://localhost:9090/admin</admin.server>
+                <admin.username>ruoyi</admin.username>
+                <admin.password>123456</admin.password>
             </properties>
         </profile>
         <profile>
@@ -77,6 +80,9 @@
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
                 <logging.level>info</logging.level>
+                <admin.server>http://localhost:9090/admin</admin.server>
+                <admin.username>ruoyi</admin.username>
+                <admin.password>123456</admin.password>
             </properties>
             <activation>
                 <!-- 默认环境 -->
@@ -88,6 +94,9 @@
             <properties>
                 <profiles.active>prod</profiles.active>
                 <logging.level>warn</logging.level>
+                <admin.server>http://localhost:9090/admin</admin.server>
+                <admin.username>ruoyi</admin.username>
+                <admin.password>123456</admin.password>
             </properties>
         </profile>
     </profiles>
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 5e20daee7..5558b8aa7 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -2,14 +2,14 @@
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090/admin
+  url: @admin.server@
   instance:
     service-host-type: IP
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
-  password: 123456
+  username: @admin.username@
+  password: @admin.password@
 
 --- # snail-job 配置
 snail-job:
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 2823bba11..a59d73b54 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -5,14 +5,14 @@ spring.servlet.multipart.location: /ruoyi/server/temp
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090/admin
+  url: @admin.server@
   instance:
     service-host-type: IP
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
-  password: 123456
+  username: @admin.username@
+  password: @admin.password@
 
 --- # snail-job 配置
 snail-job:
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index beee58775..33d7a4812 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -13,8 +13,8 @@ logging:
 spring:
   security:
     user:
-      name: ruoyi
-      password: 123456
+      name: @admin.username@
+      password: @admin.password@
   boot:
     admin:
       ui:
@@ -38,11 +38,11 @@ spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
   # 设置 Spring Boot Admin Server 地址
-  url: http://localhost:9090/admin
+  url: @admin.server@
   instance:
     service-host-type: IP
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
-  password: 123456
+  username: @admin.username@
+  password: @admin.password@
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
index cbe40be1e..164dbc419 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
@@ -40,11 +40,11 @@ snail-job:
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090/admin
+  url: @admin.server@
   instance:
     service-host-type: IP
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
-  password: 123456
+  username: @admin.username@
+  password: @admin.password@
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
index 3ba983c2b..ad28c6d8e 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
@@ -40,11 +40,11 @@ snail-job:
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090/admin
+  url: @admin.server@
   instance:
     service-host-type: IP
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ruoyi
-  password: 123456
+  username: @admin.username@
+  password: @admin.password@