Merge remote-tracking branch 'origin/dev-czh' into dev

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

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

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

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

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

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

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

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