Merge remote-tracking branch 'origin/test' into dev_lcw

ruoyi-auth/src/main/resources/bootstrap-dev.yml

@@ -11,14 +11,18 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: nacos.zkjiadi.cc
+        server-addr: local-nacos.zkjiadi.cc
         namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
-        server-addr: nacos.zkjiadi.cc
+        server-addr: local-nacos.zkjiadi.cc
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-auth/src/main/resources/bootstrap-test.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-gateway/src/main/resources/bootstrap-dev.yml

@@ -11,23 +11,27 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: nacos.zkjiadi.cc
+        server-addr: local-nacos.zkjiadi.cc
         namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
-        server-addr: nacos.zkjiadi.cc
+        server-addr: local-nacos.zkjiadi.cc
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
         namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
     sentinel:
       # 取消控制台懒加载
       eager: true
       transport:
         # 控制台地址
-        dashboard: nacos.zkjiadi.cc:8718
+        dashboard: local-nacos.zkjiadi.cc:8718
       # nacos配置持久化
       datasource:
         ds1:

ruoyi-gateway/src/main/resources/bootstrap-test.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -22,6 +24,8 @@ spring:
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
         namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
     sentinel:
       # 取消控制台懒加载
       eager: true

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-dev.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-test.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-dev.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap-test.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-dev.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-test.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-dev.yml

@@ -11,14 +11,18 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: nacos.zkjiadi.cc
+        server-addr: local-nacos.zkjiadi.cc
         namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
-        server-addr: nacos.zkjiadi.cc
+        server-addr: local-nacos.zkjiadi.cc
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-test.yml

@@ -12,6 +12,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -20,4 +22,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-dev.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        namespace: 78a7f41e-46cc-437a-9716-735888227693
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA

ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap-test.yml

@@ -13,6 +13,8 @@ spring:
         # 服务注册地址
         server-addr: nacos.zkjiadi.cc
         namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA
       config:
         # 配置中心地址
         server-addr: nacos.zkjiadi.cc
@@ -21,4 +23,6 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        namespace: 45c724b0-9b42-4ff2-bff2-9220a1788392
+        username: nacos
+        password: u0uM2RIp3Xle9VVFWtpzoz9ZdNbwG6PpWsjrOVphXzlDc0jA