From 40f8a9d775c4cbbd75a4a6ea66a2971a8debff6b Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Mon, 2 Sep 2024 16:06:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96nacos=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-auth/src/main/resources/bootstrap.yml         | 11 ++++++++++-
 ruoyi-gateway/src/main/resources/bootstrap.yml      | 13 +++++++++++--
 .../src/main/resources/bootstrap.yml                | 11 ++++++++++-
 .../ruoyi-file/src/main/resources/bootstrap.yml     |  8 +++++++-
 .../ruoyi-gen/src/main/resources/bootstrap.yml      |  8 +++++++-
 .../ruoyi-job/src/main/resources/bootstrap.yml      | 13 +++++++++++--
 .../ruoyi-system/src/main/resources/bootstrap.yml   |  8 +++++++-
 .../ruoyi-monitor/src/main/resources/bootstrap.yml  |  8 +++++++-
 8 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index c8b16589..a6607611 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -15,6 +15,10 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
+        username: nacos
+        password: nacos
+        retry:
+          enabled: true
       config:
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
@@ -22,4 +26,9 @@ spring:
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: ${spring.application.name}-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
\ No newline at end of file
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index d3abcc61..cce74447 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -15,6 +15,10 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
+        username: nacos
+        password: nacos
+        retry:
+          enabled: true
       config:
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
@@ -22,7 +26,12 @@ spring:
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: ${spring.application.name}-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
     sentinel:
       # 取消控制台懒加载
       eager: true
@@ -33,7 +42,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: nacos-ci4s.ci4s-test.svc:8848
+            server-addr: nacos-ci4s.ci4s-test.svc:18848
             dataId: sentinel-ruoyi-gateway
             groupId: DEFAULT_GROUP
             data-type: json
diff --git a/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml b/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml
index 70d87bb0..11095bb1 100644
--- a/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml
@@ -15,6 +15,10 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
+        username: nacos
+        password: nacos
+        retry:
+          enabled: true
       config:
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
@@ -22,4 +26,9 @@ spring:
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: management-platform-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
index e2649cf0..30ee8b10 100644
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -15,6 +15,10 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
+        username: nacos
+        password: nacos
+        retry:
+          enabled: true
       config:
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
@@ -22,4 +26,6 @@ spring:
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
index 664f5312..b2f67919 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
@@ -15,6 +15,10 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
+        username: nacos
+        password: nacos
+        retry:
+          enabled: true
       config:
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
@@ -22,4 +26,6 @@ spring:
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
index c1821584..8c79d3ad 100644
--- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
   port: 9203
 
 # Spring
-spring: 
+spring:
   application:
     # 应用名称
     name: ruoyi-job
@@ -15,6 +15,10 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
+        username: nacos
+        password: nacos
+        retry:
+          enabled: true
       config:
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
@@ -22,4 +26,9 @@ spring:
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: ${spring.application.name}-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 62cc1c2a..c7ddcd4e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -15,6 +15,10 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
+        username: nacos
+        password: nacos
+        retry:
+          enabled: true
       config:
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
@@ -22,4 +26,6 @@ spring:
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
index 394a74d2..c2876a08 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
+++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
@@ -15,6 +15,10 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
+        username: nacos
+        password: nacos
+        retry:
+          enabled: true
       config:
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
@@ -22,4 +26,6 @@ spring:
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+            group: DEFAULT_GROUP
+            refresh: true