Merge remote-tracking branch 'refs/remotes/origin/dev' into dev_user0622

# Conflicts: # mhd-user-center/src/main/resources/bootstrap.yml
2026-06-29 18:24:48 +08:00
parent 9ca77a7d57 eed47e1f34
commit 183c84cb5b
19 changed files with 247 additions and 53 deletions
@@ -15,8 +15,8 @@ spring:
 #        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
        server-addr: 10.33.0.129:6010
-#        username: nacos
-#        password: manhuoda@2023
+        username: nacos
+        password: manhuoda@2023
        #线上正式环境
 #        server-addr: 10.102.192.5:6848
 #        username: nacos
@@ -27,8 +27,8 @@ spring:
        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.102.192.5:6848
-#        username: nacos
-#        password: manhuoda@2023
+        username: nacos
+        password: manhuoda@2023
        #线上正式环境
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties