Merge branch 'dev_nc2k_20251213' into dev

# Conflicts: # mhd-auth/src/main/resources/bootstrap.yml # mhd-gateway/src/main/resources/bootstrap.yml # mhd-modules/mhd-system/src/main/resources/bootstrap.yml # mhd-user-center/src/main/resources/bootstrap.yml # mhd_finance/src/main/resources/bootstrap.yml # mhd_product/src/main/resources/bootstrap.yml # mhd_thrid_party/src/main/resources/bootstrap.yml # mhd_transport/src/main/resources/bootstrap.yml
2025-12-13 17:32:20 +08:00
parent 74e735353f 3447d2f7bc
commit f8399951b3
19 changed files with 371 additions and 106 deletions
@@ -18,25 +18,20 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
-      #        server-addr: 10.33.0.129:6010
-#        server-addr: 116.204.23.92:8848
+        server-addr: 10.33.0.129:6010
+        #线上正式环境
+#        server-addr: 10.102.192.105:6848
      config:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
 #        server-addr: 116.204.23.92:8848
 #         线上测试环境配置 容器名+端口号
-        #        server-addr: 10.33.0.129:6010
+        server-addr: 10.33.0.129:6010
+        #线上正式环境
+#        server-addr: 10.102.192.105:6848
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
        shared-configs:
          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-redisson:
-  config:
-    singleServerConfig:
-      address: redis://116.204.89.187:4399
-      connectTimeout: 10000  # 连接超时时间
-      timeout: 10000         # 命令执行超时时间
-      retryAttempts: 3       # 重试次数
-      retryInterval: 1500    # 重试间隔