diff --git a/forgeboot-trace/forgeboot-trace-api/build.gradle.kts b/forgeboot-trace/forgeboot-trace-api/build.gradle.kts index 2e3ca6a..dc2f2ec 100644 --- a/forgeboot-trace/forgeboot-trace-api/build.gradle.kts +++ b/forgeboot-trace/forgeboot-trace-api/build.gradle.kts @@ -1,3 +1,5 @@ dependencies { - + compileOnly(platform(libs.springBootDependencies.bom)) + compileOnly(libs.springBootStarter.web) + kapt(libs.springBoot.configuration.processor) } diff --git a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/config/TraceProperties.kt b/forgeboot-trace/forgeboot-trace-api/src/main/kotlin/com/gewuyou/forgeboot/trace/api/config/TraceProperties.kt similarity index 95% rename from forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/config/TraceProperties.kt rename to forgeboot-trace/forgeboot-trace-api/src/main/kotlin/com/gewuyou/forgeboot/trace/api/config/TraceProperties.kt index 7b9ede7..2065492 100644 --- a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/config/TraceProperties.kt +++ b/forgeboot-trace/forgeboot-trace-api/src/main/kotlin/com/gewuyou/forgeboot/trace/api/config/TraceProperties.kt @@ -1,4 +1,4 @@ -package com.gewuyou.forgeboot.trace.impl.config +package com.gewuyou.forgeboot.trace.api.config import org.springframework.boot.context.properties.ConfigurationProperties diff --git a/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/FeignTraceAutoConfiguration.kt b/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/FeignTraceAutoConfiguration.kt index 58f4de9..477f837 100644 --- a/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/FeignTraceAutoConfiguration.kt +++ b/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/FeignTraceAutoConfiguration.kt @@ -1,7 +1,7 @@ package com.gewuyou.forgeboot.trace.autoconfig import com.gewuyou.forgeboot.core.extension.log -import com.gewuyou.forgeboot.trace.impl.config.TraceProperties +import com.gewuyou.forgeboot.trace.api.config.TraceProperties import org.springframework.boot.autoconfigure.condition.ConditionalOnClass import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Bean diff --git a/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/TraceAutoConfiguration.kt b/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/TraceAutoConfiguration.kt index 8e526f6..a9f6141 100644 --- a/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/TraceAutoConfiguration.kt +++ b/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/TraceAutoConfiguration.kt @@ -3,7 +3,7 @@ package com.gewuyou.forgeboot.trace.autoconfig import com.gewuyou.forgeboot.core.extension.log import com.gewuyou.forgeboot.trace.api.RequestIdProvider -import com.gewuyou.forgeboot.trace.impl.config.TraceProperties +import com.gewuyou.forgeboot.trace.api.config.TraceProperties import com.gewuyou.forgeboot.trace.impl.decorator.RequestIdTaskDecorator import com.gewuyou.forgeboot.trace.impl.filter.ReactiveRequestIdFilter import com.gewuyou.forgeboot.trace.impl.filter.RequestIdFilter diff --git a/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/WebClientTraceAutoConfiguration.kt b/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/WebClientTraceAutoConfiguration.kt index 1163cec..7d123ec 100644 --- a/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/WebClientTraceAutoConfiguration.kt +++ b/forgeboot-trace/forgeboot-trace-autoconfigure/src/main/kotlin/com/gewuyou/forgeboot/trace/autoconfig/WebClientTraceAutoConfiguration.kt @@ -1,7 +1,7 @@ package com.gewuyou.forgeboot.trace.autoconfig import com.gewuyou.forgeboot.core.extension.log -import com.gewuyou.forgeboot.trace.impl.config.TraceProperties +import com.gewuyou.forgeboot.trace.api.config.TraceProperties import com.gewuyou.forgeboot.trace.impl.filter.WebClientRequestIdFilter import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.boot.autoconfigure.condition.ConditionalOnClass diff --git a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/decorator/RequestIdTaskDecorator.kt b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/decorator/RequestIdTaskDecorator.kt index 1efc18e..092556b 100644 --- a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/decorator/RequestIdTaskDecorator.kt +++ b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/decorator/RequestIdTaskDecorator.kt @@ -1,6 +1,6 @@ package com.gewuyou.forgeboot.trace.impl.decorator -import com.gewuyou.forgeboot.trace.impl.config.TraceProperties +import com.gewuyou.forgeboot.trace.api.config.TraceProperties import org.slf4j.MDC import org.springframework.core.task.TaskDecorator diff --git a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/ReactiveRequestIdFilter.kt b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/ReactiveRequestIdFilter.kt index 45188ed..ca746a2 100644 --- a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/ReactiveRequestIdFilter.kt +++ b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/ReactiveRequestIdFilter.kt @@ -3,7 +3,7 @@ package com.gewuyou.forgeboot.trace.impl.filter import com.gewuyou.forgeboot.core.extension.log -import com.gewuyou.forgeboot.trace.impl.config.TraceProperties +import com.gewuyou.forgeboot.trace.api.config.TraceProperties import com.gewuyou.forgeboot.trace.impl.extension.isSkipRequest import com.gewuyou.forgeboot.trace.impl.util.RequestIdUtil diff --git a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/RequestIdFilter.kt b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/RequestIdFilter.kt index 5d3e7d8..587531f 100644 --- a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/RequestIdFilter.kt +++ b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/RequestIdFilter.kt @@ -2,7 +2,7 @@ package com.gewuyou.forgeboot.trace.impl.filter import com.gewuyou.forgeboot.core.extension.log -import com.gewuyou.forgeboot.trace.impl.config.TraceProperties +import com.gewuyou.forgeboot.trace.api.config.TraceProperties import com.gewuyou.forgeboot.trace.impl.extension.isSkipRequest import com.gewuyou.forgeboot.trace.impl.util.RequestIdUtil diff --git a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/WebClientRequestIdFilter.kt b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/WebClientRequestIdFilter.kt index 39ed629..6e20038 100644 --- a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/WebClientRequestIdFilter.kt +++ b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/filter/WebClientRequestIdFilter.kt @@ -1,7 +1,7 @@ package com.gewuyou.forgeboot.trace.impl.filter import com.gewuyou.forgeboot.core.extension.log -import com.gewuyou.forgeboot.trace.impl.config.TraceProperties +import com.gewuyou.forgeboot.trace.api.config.TraceProperties import com.gewuyou.forgeboot.trace.impl.extension.isSkipRequest import com.gewuyou.forgeboot.trace.impl.util.RequestIdUtil diff --git a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/interceptor/FeignRequestIdInterceptor.kt b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/interceptor/FeignRequestIdInterceptor.kt index e5b0676..8bceff4 100644 --- a/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/interceptor/FeignRequestIdInterceptor.kt +++ b/forgeboot-trace/forgeboot-trace-impl/src/main/kotlin/com/gewuyou/forgeboot/trace/impl/interceptor/FeignRequestIdInterceptor.kt @@ -3,7 +3,7 @@ package com.gewuyou.forgeboot.trace.impl.interceptor import com.gewuyou.forgeboot.core.extension.log -import com.gewuyou.forgeboot.trace.impl.config.TraceProperties +import com.gewuyou.forgeboot.trace.api.config.TraceProperties import com.gewuyou.forgeboot.trace.impl.util.RequestIdUtil import feign.RequestInterceptor import feign.RequestTemplate