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

2025-10-30 18:25:41 +08:00 · 2025-10-30 18:25:41 +08:00 · fbf2871e81
parent e99ccf8e13 aa36ee79a1
commit fbf2871e81
20 changed files with 165 additions and 49 deletions
--- a/cash-api/account-server/src/main/resources/application-dev.yml
+++ b/cash-api/account-server/src/main/resources/application-dev.yml
@ -49,3 +49,13 @@ seata:
      namespace:
      group: group_seata

+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
--- a/cash-api/account-server/src/main/resources/application-prod.yml
+++ b/cash-api/account-server/src/main/resources/application-prod.yml
@ -51,3 +51,14 @@ seata:
      namespace:
      group: group_seata

+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://121.40.109.122:9411/api/v2/spans
+
--- a/cash-api/account-server/src/main/resources/application-test.yml
+++ b/cash-api/account-server/src/main/resources/application-test.yml
@ -51,3 +51,14 @@ seata:
      namespace:
      group: group_seata

+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
+
--- a/cash-api/account-server/src/main/resources/application.yml
+++ b/cash-api/account-server/src/main/resources/application.yml
@ -8,16 +8,6 @@ spring:
    active: dev
    include: tools

-# TraceID
-management:
-  tracing:
-    enabled: true
-    sampling:
-      probability: 1.0 # 100% 采样，生产可降低
-  zipkin:
-    tracing:
-      endpoint: http://192.168.1.42:9411/api/v2/spans
-

 logging:
  config: classpath:logback.xml
--- a/cash-api/market-server/src/main/resources/application-dev.yml
+++ b/cash-api/market-server/src/main/resources/application-dev.yml
@ -54,3 +54,14 @@ seata:
      server-addr: 121.40.109.122:8848
      namespace:
      group: group_seata
+
+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
--- a/cash-api/market-server/src/main/resources/application-prod.yml
+++ b/cash-api/market-server/src/main/resources/application-prod.yml
@ -48,3 +48,14 @@ seata:
      server-addr: 121.40.109.122:8848
      namespace:
      group: group_seata
+
+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://121.40.109.122:9411/api/v2/spans
--- a/cash-api/market-server/src/main/resources/application-test.yml
+++ b/cash-api/market-server/src/main/resources/application-test.yml
@ -48,3 +48,14 @@ seata:
      server-addr: 121.40.109.122:8848
      namespace:
      group: group_seata
+
+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
--- a/cash-api/market-server/src/main/resources/application.yml
+++ b/cash-api/market-server/src/main/resources/application.yml
@ -14,16 +14,6 @@ wx:
    operationMsgTmpId: wFdoUG-dUT7bDRHq8bMJD9CF5TjyH9x_uJQgQByZqHg
    warnMsgTmpId: C08OUr80x6wGmUN1zpFhSQ3Sv7VF5vksdZigiEx2pD0

-# TraceID
-management:
-  tracing:
-    enabled: true
-    sampling:
-      probability: 1.0 # 100% 采样，生产可降低
-  zipkin:
-    tracing:
-      endpoint: http://192.168.1.42:9411/api/v2/spans
-


 logging:
--- a/cash-api/order-server/src/main/resources/application-dev.yml
+++ b/cash-api/order-server/src/main/resources/application-dev.yml
@ -49,3 +49,14 @@ seata:
      server-addr: 121.40.109.122:8848
      namespace:
      group: group_seata
+
+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
--- a/cash-api/order-server/src/main/resources/application-prod.yml
+++ b/cash-api/order-server/src/main/resources/application-prod.yml
@ -54,3 +54,14 @@ seata:
      namespace:
      group: group_seata

+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://121.40.109.122:9411/api/v2/spans
+
--- a/cash-api/order-server/src/main/resources/application-test.yml
+++ b/cash-api/order-server/src/main/resources/application-test.yml
@ -54,3 +54,14 @@ seata:
      namespace:
      group: group_seata

+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
+
--- a/cash-api/order-server/src/main/resources/application.yml
+++ b/cash-api/order-server/src/main/resources/application.yml
@ -8,16 +8,6 @@ spring:
    active: dev
    include: tools

-# TraceID
-management:
-  tracing:
-    enabled: true
-    sampling:
-      probability: 1.0 # 100% 采样，生产可降低
-  zipkin:
-    tracing:
-      endpoint: http://192.168.1.42:9411/api/v2/spans
-

 logging:
  config: classpath:logback.xml
--- a/cash-api/product-server/src/main/resources/application-dev.yml
+++ b/cash-api/product-server/src/main/resources/application-dev.yml
@ -54,3 +54,14 @@ seata:
      server-addr: 121.40.109.122:8848
      namespace:
      group: group_seata
+
+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
--- a/cash-api/product-server/src/main/resources/application-prod.yml
+++ b/cash-api/product-server/src/main/resources/application-prod.yml
@ -48,3 +48,14 @@ seata:
      server-addr: 121.40.109.122:8848
      namespace:
      group: group_seata
+
+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://121.40.109.122:9411/api/v2/spans
--- a/cash-api/product-server/src/main/resources/application-test.yml
+++ b/cash-api/product-server/src/main/resources/application-test.yml
@ -48,3 +48,14 @@ seata:
      server-addr: 121.40.109.122:8848
      namespace:
      group: group_seata
+
+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
--- a/cash-api/product-server/src/main/resources/application.yml
+++ b/cash-api/product-server/src/main/resources/application.yml
@ -18,15 +18,7 @@ wx:
    appId: wx1fb600d0f5ea6279
    secrete: b4c0534c9b5e6c84a7fe5c2078dff876

-# TraceID
-management:
-  tracing:
-    enabled: true
-    sampling:
-      probability: 1.0 # 100% 采样，生产可降低
-  zipkin:
-    tracing:
-      endpoint: http://192.168.1.42:9411/api/v2/spans
+


 logging:
--- a/cash-api/system-server/src/main/resources/application-dev.yml
+++ b/cash-api/system-server/src/main/resources/application-dev.yml
@ -50,3 +50,14 @@ seata:
      namespace:
      group: group_seata

+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
+
--- a/cash-api/system-server/src/main/resources/application-prod.yml
+++ b/cash-api/system-server/src/main/resources/application-prod.yml
@ -51,3 +51,14 @@ seata:
      namespace:
      group: group_seata

+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://121.40.109.122:9411/api/v2/spans
+
--- a/cash-api/system-server/src/main/resources/application-test.yml
+++ b/cash-api/system-server/src/main/resources/application-test.yml
@ -51,3 +51,14 @@ seata:
      namespace:
      group: group_seata

+
+# TraceID
+management:
+  tracing:
+    enabled: true
+    sampling:
+      probability: 1.0 # 100% 采样，生产可降低
+  zipkin:
+    tracing:
+      endpoint: http://192.168.1.42:9411/api/v2/spans
+
--- a/cash-api/system-server/src/main/resources/application.yml
+++ b/cash-api/system-server/src/main/resources/application.yml
@ -7,16 +7,6 @@ spring:
  profiles:
    active: dev

-# TraceID
-management:
-  tracing:
-    enabled: true
-    sampling:
-      probability: 1.0 # 100% 采样，生产可降低
-  zipkin:
-    tracing:
-      endpoint: http://192.168.1.42:9411/api/v2/spans
-

 logging:
  config: classpath:logback.xml