diff --git a/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/annotation/EnableOnnFeignClients.java b/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/annotation/EnableOnnFeignClients.java index 481e107..6a9c090 100644 --- a/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/annotation/EnableOnnFeignClients.java +++ b/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/annotation/EnableOnnFeignClients.java @@ -14,11 +14,6 @@ package com.chushang.common.feign.annotation;/* * limitations under the License. */ -import com.chushang.common.feign.interceptor.FeignHeaderInterceptor; -import com.chushang.common.feign.interceptor.MdcInterceptor; -import com.chushang.common.feign.registrar.MdcFilterRegistrar; -import com.chushang.common.feign.registrar.TransferFeginFilterRegistrar; -import com.chushang.common.feign.registrar.TransferFilterRegistrar; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClientsConfiguration; import org.springframework.cloud.openfeign.ChushangFeignClientsRegistrar; diff --git a/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/interceptor/MdcInterceptor.java b/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/interceptor/MdcInterceptor.java index b0776e9..0b0311c 100644 --- a/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/interceptor/MdcInterceptor.java +++ b/chushang-common/chushang-common-feign/src/main/java/com/chushang/common/feign/interceptor/MdcInterceptor.java @@ -8,13 +8,16 @@ package com.chushang.common.feign.interceptor; import com.chushang.common.core.constant.CommonConstants; import feign.RequestInterceptor; import feign.RequestTemplate; +import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; +@Slf4j public class MdcInterceptor implements RequestInterceptor { public MdcInterceptor() { } public void apply(RequestTemplate template) { + log.info("TRACE_ID : -------- {}", MDC.get(CommonConstants.TRACE_ID)); template.header(CommonConstants.TRACE_ID, MDC.get(CommonConstants.TRACE_ID)); template.header(CommonConstants.SPAN, MDC.get(CommonConstants.SPAN)); } diff --git a/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/AuthApplication.java b/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/AuthApplication.java index 9cb0e57..be53c24 100644 --- a/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/AuthApplication.java +++ b/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/AuthApplication.java @@ -2,6 +2,7 @@ package com.chushang; import com.chushang.common.core.enums.AppStartType; import com.chushang.common.feign.annotation.EnableOnnFeignClients; +import com.chushang.common.feign.annotation.EnableTransferFeign; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; @@ -21,6 +22,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @EnableOnnFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) @ServletComponentScan +@EnableTransferFeign public class AuthApplication extends SpringBootServletInitializer { private final static Logger log = LoggerFactory.getLogger(AuthApplication.class); diff --git a/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml index 9515ba1..977c569 100644 --- a/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml +++ b/chushang-modules/chushang-module-auth/auth-service/src/main/resources/logback-nacos.xml @@ -18,7 +18,7 @@ - + - + --> - + diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/OssApplication.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/OssApplication.java index cb90c24..bb29269 100644 --- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/OssApplication.java +++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/OssApplication.java @@ -2,16 +2,12 @@ package com.chushang.oss; import com.chushang.common.core.enums.AppStartType; import com.chushang.common.feign.annotation.EnableOnnFeignClients; -import com.chushang.common.feign.annotation.EnableTransferFeign; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import javax.sql.DataSource; - /** * @auther: zhao * @date: 2024/4/29 10:50 @@ -19,7 +15,7 @@ import javax.sql.DataSource; @EnableDiscoveryClient @EnableOnnFeignClients @SpringBootApplication -@EnableTransferFeign +//@EnableTransferFeign public class OssApplication { private final static Logger log = LoggerFactory.getLogger(OssApplication.class); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml index 9515ba1..977c569 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml +++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/logback-nacos.xml @@ -18,7 +18,7 @@ - +