diff --git a/cash-api/account-server/src/main/resources/application-dev.yml b/cash-api/account-server/src/main/resources/application-dev.yml index 988a1d8e..a07b7f12 100644 --- a/cash-api/account-server/src/main/resources/application-dev.yml +++ b/cash-api/account-server/src/main/resources/application-dev.yml @@ -48,14 +48,3 @@ 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 \ No newline at end of file diff --git a/cash-api/account-server/src/main/resources/application-prod.yml b/cash-api/account-server/src/main/resources/application-prod.yml index c62f5e47..d03cf510 100644 --- a/cash-api/account-server/src/main/resources/application-prod.yml +++ b/cash-api/account-server/src/main/resources/application-prod.yml @@ -52,13 +52,3 @@ seata: 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 - diff --git a/cash-api/account-server/src/main/resources/application-test.yml b/cash-api/account-server/src/main/resources/application-test.yml index 9302da02..e757f2a4 100644 --- a/cash-api/account-server/src/main/resources/application-test.yml +++ b/cash-api/account-server/src/main/resources/application-test.yml @@ -52,13 +52,3 @@ seata: 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 - diff --git a/cash-api/account-server/src/main/resources/application.yml b/cash-api/account-server/src/main/resources/application.yml index 306b4068..fa28f2a4 100644 --- a/cash-api/account-server/src/main/resources/application.yml +++ b/cash-api/account-server/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: account-server + name: account profiles: active: dev include: tools diff --git a/cash-api/market-server/src/main/resources/application-dev.yml b/cash-api/market-server/src/main/resources/application-dev.yml index a2f28d28..7c8b0aee 100644 --- a/cash-api/market-server/src/main/resources/application-dev.yml +++ b/cash-api/market-server/src/main/resources/application-dev.yml @@ -55,13 +55,3 @@ 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 diff --git a/cash-api/market-server/src/main/resources/application-prod.yml b/cash-api/market-server/src/main/resources/application-prod.yml index f55f79a1..0abeeaff 100644 --- a/cash-api/market-server/src/main/resources/application-prod.yml +++ b/cash-api/market-server/src/main/resources/application-prod.yml @@ -48,14 +48,3 @@ 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 diff --git a/cash-api/market-server/src/main/resources/application-test.yml b/cash-api/market-server/src/main/resources/application-test.yml index 8998e975..f4012446 100644 --- a/cash-api/market-server/src/main/resources/application-test.yml +++ b/cash-api/market-server/src/main/resources/application-test.yml @@ -47,15 +47,4 @@ seata: nacos: 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 + group: group_seata \ No newline at end of file diff --git a/cash-api/market-server/src/main/resources/application.yml b/cash-api/market-server/src/main/resources/application.yml index 8090c2d0..bb6c5c30 100644 --- a/cash-api/market-server/src/main/resources/application.yml +++ b/cash-api/market-server/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: market-server + name: market profiles: active: dev include: tools diff --git a/cash-api/order-server/src/main/resources/application-dev.yml b/cash-api/order-server/src/main/resources/application-dev.yml index 3f337bf4..a2d9fc02 100644 --- a/cash-api/order-server/src/main/resources/application-dev.yml +++ b/cash-api/order-server/src/main/resources/application-dev.yml @@ -49,14 +49,3 @@ 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 diff --git a/cash-api/order-server/src/main/resources/application-prod.yml b/cash-api/order-server/src/main/resources/application-prod.yml index 75b73576..dd054461 100644 --- a/cash-api/order-server/src/main/resources/application-prod.yml +++ b/cash-api/order-server/src/main/resources/application-prod.yml @@ -53,15 +53,3 @@ 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 - diff --git a/cash-api/order-server/src/main/resources/application-test.yml b/cash-api/order-server/src/main/resources/application-test.yml index 6e12c565..fef80273 100644 --- a/cash-api/order-server/src/main/resources/application-test.yml +++ b/cash-api/order-server/src/main/resources/application-test.yml @@ -53,15 +53,3 @@ 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 - diff --git a/cash-api/order-server/src/main/resources/application.yml b/cash-api/order-server/src/main/resources/application.yml index 9b6dcdab..4ba37f26 100644 --- a/cash-api/order-server/src/main/resources/application.yml +++ b/cash-api/order-server/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: order-server + name: order profiles: active: dev include: tools diff --git a/cash-api/product-server/src/main/resources/application-dev.yml b/cash-api/product-server/src/main/resources/application-dev.yml index 5b733080..f5ffe375 100644 --- a/cash-api/product-server/src/main/resources/application-dev.yml +++ b/cash-api/product-server/src/main/resources/application-dev.yml @@ -53,15 +53,4 @@ seata: nacos: 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 + group: group_seata \ No newline at end of file diff --git a/cash-api/product-server/src/main/resources/application-prod.yml b/cash-api/product-server/src/main/resources/application-prod.yml index a43e288c..5b30e413 100644 --- a/cash-api/product-server/src/main/resources/application-prod.yml +++ b/cash-api/product-server/src/main/resources/application-prod.yml @@ -48,14 +48,3 @@ 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 diff --git a/cash-api/product-server/src/main/resources/application-test.yml b/cash-api/product-server/src/main/resources/application-test.yml index 33bca3ff..30da0d6a 100644 --- a/cash-api/product-server/src/main/resources/application-test.yml +++ b/cash-api/product-server/src/main/resources/application-test.yml @@ -48,14 +48,3 @@ 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 diff --git a/cash-api/product-server/src/main/resources/application.yml b/cash-api/product-server/src/main/resources/application.yml index 42890e03..4742d4a3 100644 --- a/cash-api/product-server/src/main/resources/application.yml +++ b/cash-api/product-server/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: product-server + name: product profiles: active: dev include: tools diff --git a/cash-api/system-server/src/main/resources/application-dev.yml b/cash-api/system-server/src/main/resources/application-dev.yml index d7795cba..d8063b18 100644 --- a/cash-api/system-server/src/main/resources/application-dev.yml +++ b/cash-api/system-server/src/main/resources/application-dev.yml @@ -50,14 +50,3 @@ 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 - diff --git a/cash-api/system-server/src/main/resources/application-prod.yml b/cash-api/system-server/src/main/resources/application-prod.yml index d3dbf188..2dd0c226 100644 --- a/cash-api/system-server/src/main/resources/application-prod.yml +++ b/cash-api/system-server/src/main/resources/application-prod.yml @@ -51,14 +51,3 @@ 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 - diff --git a/cash-api/system-server/src/main/resources/application-test.yml b/cash-api/system-server/src/main/resources/application-test.yml index ef5b4e02..ef0ddeec 100644 --- a/cash-api/system-server/src/main/resources/application-test.yml +++ b/cash-api/system-server/src/main/resources/application-test.yml @@ -51,14 +51,3 @@ 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 - diff --git a/cash-api/system-server/src/main/resources/application.yml b/cash-api/system-server/src/main/resources/application.yml index 56d7abfc..6b3054e5 100644 --- a/cash-api/system-server/src/main/resources/application.yml +++ b/cash-api/system-server/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: system-server + name: system profiles: active: dev diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/config/CorsFilter.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/CorsFilter.java index 51a6b9c1..6fc907f1 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/CorsFilter.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/config/CorsFilter.java @@ -1,20 +1,31 @@ package com.czg.config; +import cn.hutool.core.util.IdUtil; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.MDC; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import java.io.IOException; +import java.util.Map; /** * @author GYJoker */ @Configuration public class CorsFilter implements Filter { + + @Value("${spring.application.name:unknown-service}") + private String applicationName; @Override public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException { + // traceId + Map copyOfContextMap = MDC.getCopyOfContextMap(); + copyOfContextMap.put("traceId",applicationName + IdUtil.getSnowflakeNextId()); + MDC.setContextMap(copyOfContextMap); HttpServletResponse response = (HttpServletResponse) resp; HttpServletRequest reqs = (HttpServletRequest) req; String curOrigin = reqs.getHeader("Origin"); diff --git a/cash-dependencies/pom.xml b/cash-dependencies/pom.xml index 67c2b1f2..2d794cba 100644 --- a/cash-dependencies/pom.xml +++ b/cash-dependencies/pom.xml @@ -41,9 +41,6 @@ 3.8.0 2.5.1 2.9.10 - 1.6.0-M3 - 3.5.1 - 4.0.0-M3 diff --git a/cash-service/pom.xml b/cash-service/pom.xml index 797e93d9..a74a3949 100644 --- a/cash-service/pom.xml +++ b/cash-service/pom.xml @@ -98,29 +98,5 @@ hibernate-validator 8.0.2.Final - - - - io.micrometer - micrometer-tracing-bridge-brave - - - - io.micrometer - micrometer-observation - - - - - io.zipkin.reporter2 - zipkin-reporter-brave - - - - org.springframework.boot - spring-boot-starter-actuator - - -