diff --git a/README.md b/README.md index e1491747..8ac04124 100644 --- a/README.md +++ b/README.md @@ -172,10 +172,10 @@ continew-starter.web: ### 日志模块 -| 模块名称 | 模块说明 | -| ---------------------------------- | ----------------------------------------- | -| continew-starter-log-core | 日志核心模块 | -| continew-starter-log-httptrace-pro | Spring Boot Actuator HttpTrace 重置增强版 | +| 模块名称 | 模块说明 | +|----------------------------------| ----------------------------------------- | +| continew-starter-log-core | 日志核心模块 | +| continew-starter-log-interceptor | 拦截器版(Spring Boot Actuator HttpTrace 增强版) | ### 存储模块 diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml index c824d85b..1b9de7ee 100644 --- a/continew-starter-dependencies/pom.xml +++ b/continew-starter-dependencies/pom.xml @@ -446,10 +446,10 @@ ${revision} - + top.continew - continew-starter-log-httptrace-pro + continew-starter-log-interceptor ${revision} diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c87053f0..00000000 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -top.continew.starter.log.httptracepro.autoconfigure.LogAutoConfiguration \ No newline at end of file diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml b/continew-starter-log/continew-starter-log-interceptor/pom.xml similarity index 85% rename from continew-starter-log/continew-starter-log-httptrace-pro/pom.xml rename to continew-starter-log/continew-starter-log-interceptor/pom.xml index 4348ef61..40f0b564 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml +++ b/continew-starter-log/continew-starter-log-interceptor/pom.xml @@ -9,8 +9,8 @@ ${revision} - continew-starter-log-httptrace-pro - ContiNew Starter 日志模块 - HttpTracePro(Spring Boot Actuator HttpTrace 重置增强版) + continew-starter-log-interceptor + ContiNew Starter 日志模块 - 拦截器版(Spring Boot Actuator HttpTrace 增强版) diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/ConditionalOnEnabledLog.java similarity index 94% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java rename to continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/ConditionalOnEnabledLog.java index fcf3cd41..ea8a9873 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java +++ b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/ConditionalOnEnabledLog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.log.httptracepro.autoconfigure; +package top.continew.starter.log.interceptor.autoconfigure; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import top.continew.starter.core.constant.PropertiesConstants; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/LogAutoConfiguration.java similarity index 89% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java rename to continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/LogAutoConfiguration.java index cd207cc9..d9934f09 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java +++ b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/LogAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.log.httptracepro.autoconfigure; +package top.continew.starter.log.interceptor.autoconfigure; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; @@ -28,8 +28,8 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import top.continew.starter.log.core.dao.LogDao; import top.continew.starter.log.core.dao.impl.LogDaoDefaultImpl; -import top.continew.starter.log.httptracepro.handler.LogFilter; -import top.continew.starter.log.httptracepro.handler.LogInterceptor; +import top.continew.starter.log.interceptor.handler.LogFilter; +import top.continew.starter.log.interceptor.handler.LogInterceptor; /** * 日志自动配置 @@ -75,6 +75,6 @@ public class LogAutoConfiguration implements WebMvcConfigurer { @PostConstruct public void postConstruct() { - log.debug("[ContiNew Starter] - Auto Configuration 'Log-HttpTracePro' completed initialization."); + log.debug("[ContiNew Starter] - Auto Configuration 'Log' completed initialization."); } } diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogProperties.java b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/LogProperties.java similarity index 97% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogProperties.java rename to continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/LogProperties.java index f52a2a4a..6aef2845 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogProperties.java +++ b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/autoconfigure/LogProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.log.httptracepro.autoconfigure; +package top.continew.starter.log.interceptor.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; import top.continew.starter.core.constant.PropertiesConstants; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogFilter.java b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/LogFilter.java similarity index 97% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogFilter.java rename to continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/LogFilter.java index 41aebaea..acc0a4e2 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogFilter.java +++ b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/LogFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.log.httptracepro.handler; +package top.continew.starter.log.interceptor.handler; import cn.hutool.extra.spring.SpringUtil; import jakarta.servlet.FilterChain; @@ -29,7 +29,7 @@ import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.util.ContentCachingResponseWrapper; import org.springframework.web.util.WebUtils; import top.continew.starter.log.core.enums.Include; -import top.continew.starter.log.httptracepro.autoconfigure.LogProperties; +import top.continew.starter.log.interceptor.autoconfigure.LogProperties; import top.continew.starter.web.util.SpringWebUtils; import java.io.IOException; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogInterceptor.java b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/LogInterceptor.java similarity index 98% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogInterceptor.java rename to continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/LogInterceptor.java index 6d8def3b..99e59c4d 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogInterceptor.java +++ b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/LogInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.log.httptracepro.handler; +package top.continew.starter.log.interceptor.handler; import cn.hutool.core.text.CharSequenceUtil; import com.alibaba.ttl.TransmittableThreadLocal; @@ -33,7 +33,7 @@ import top.continew.starter.log.core.dao.LogDao; import top.continew.starter.log.core.enums.Include; import top.continew.starter.log.core.model.LogRecord; import top.continew.starter.log.core.model.LogResponse; -import top.continew.starter.log.httptracepro.autoconfigure.LogProperties; +import top.continew.starter.log.interceptor.autoconfigure.LogProperties; import java.time.Clock; import java.util.Set; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/RecordableServletHttpRequest.java similarity index 98% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java rename to continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/RecordableServletHttpRequest.java index 71cea0b1..dccd394b 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java +++ b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/RecordableServletHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.log.httptracepro.handler; +package top.continew.starter.log.interceptor.handler; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/RecordableServletHttpResponse.java similarity index 97% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java rename to continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/RecordableServletHttpResponse.java index 7927bd29..d6d3d944 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java +++ b/continew-starter-log/continew-starter-log-interceptor/src/main/java/top/continew/starter/log/interceptor/handler/RecordableServletHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.log.httptracepro.handler; +package top.continew.starter.log.interceptor.handler; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; diff --git a/continew-starter-log/continew-starter-log-interceptor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-log/continew-starter-log-interceptor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..2304f8f4 --- /dev/null +++ b/continew-starter-log/continew-starter-log-interceptor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +top.continew.starter.log.interceptor.autoconfigure.LogAutoConfiguration \ No newline at end of file diff --git a/continew-starter-log/pom.xml b/continew-starter-log/pom.xml index 02bf4b02..561c4be2 100644 --- a/continew-starter-log/pom.xml +++ b/continew-starter-log/pom.xml @@ -15,7 +15,7 @@ continew-starter-log-core - continew-starter-log-httptrace-pro + continew-starter-log-interceptor