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
@@ -102,6 +102,7 @@
            <artifactId>spring-cloud-starter-sleuth</artifactId>
        </dependency>

+
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-zipkin</artifactId>
@@ -18,15 +18,19 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
        # 线上测试环境配置使用ip+端口号
 #        server-addr: 10.33.0.129:6010r
-      #        server-addr: 10.33.0.129:6010
+        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
        # 线上测试环境配置使用ip+端口号
+        server-addr: 10.33.0.129:6010
 #        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
        # 共享配置