Merge branch 'dev' into master

# Conflicts: # mhd-auth/src/main/resources/bootstrap.yml # mhd-gateway/src/main/resources/bootstrap.yml # mhd-user-center/src/main/resources/bootstrap.yml # mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
2026-01-15 03:36:33 +08:00
parent 2e284f450d e6b81b38ee
commit 015162d5c9
148 changed files with 6734 additions and 835 deletions
@@ -14,19 +14,20 @@ spring:
      discovery:
 #        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
-        #server-addr: 10.33.0.129:6010
-        #线上正式环境
        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
+        #线上正式环境
+#        server-addr: 10.102.192.5:6848
+#        username: nacos
+#        password: manhuoda@2023
      config:
 #        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
-        #server-addr: 10.33.0.129:6010
-        #线上正式环境
        server-addr: 10.102.192.5:6848
        username: nacos
        password: manhuoda@2023
+        #线上正式环境
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置