diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml index 061e74bd..5b1c712c 100644 --- a/continew-starter-dependencies/pom.xml +++ b/continew-starter-dependencies/pom.xml @@ -398,10 +398,10 @@ ${revision} - + top.charles7c.continew - continew-starter-log-common + continew-starter-log-core ${revision} diff --git a/continew-starter-log/continew-starter-log-common/pom.xml b/continew-starter-log/continew-starter-log-core/pom.xml similarity index 80% rename from continew-starter-log/continew-starter-log-common/pom.xml rename to continew-starter-log/continew-starter-log-core/pom.xml index a513f40e..9ac7a889 100644 --- a/continew-starter-log/continew-starter-log-common/pom.xml +++ b/continew-starter-log/continew-starter-log-core/pom.xml @@ -9,6 +9,6 @@ ${revision} - continew-starter-log-common - ContiNew Starter 日志模块 - 公共模块 + continew-starter-log-core + ContiNew Starter 日志模块 - 核心模块 \ No newline at end of file diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/annotation/Log.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/annotation/Log.java similarity index 93% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/annotation/Log.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/annotation/Log.java index 1b73f099..c04171fd 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/annotation/Log.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/annotation/Log.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.annotation; +package top.charles7c.continew.starter.log.core.annotation; -import top.charles7c.continew.starter.log.common.enums.Include; +import top.charles7c.continew.starter.log.core.enums.Include; import java.lang.annotation.*; diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/dao/LogDao.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/LogDao.java similarity index 89% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/dao/LogDao.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/LogDao.java index 1e047596..9dde1f25 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/dao/LogDao.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/LogDao.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.dao; +package top.charles7c.continew.starter.log.core.dao; -import top.charles7c.continew.starter.log.common.model.LogRecord; +import top.charles7c.continew.starter.log.core.model.LogRecord; import java.util.Collections; import java.util.List; diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/dao/impl/LogDaoDefaultImpl.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java similarity index 92% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/dao/impl/LogDaoDefaultImpl.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java index 35a3fd91..e83bbab3 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/dao/impl/LogDaoDefaultImpl.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.dao.impl; +package top.charles7c.continew.starter.log.core.dao.impl; -import top.charles7c.continew.starter.log.common.dao.LogDao; -import top.charles7c.continew.starter.log.common.model.LogRecord; +import top.charles7c.continew.starter.log.core.dao.LogDao; +import top.charles7c.continew.starter.log.core.model.LogRecord; import java.util.LinkedList; import java.util.List; diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/enums/Include.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/enums/Include.java similarity index 97% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/enums/Include.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/enums/Include.java index 74d06952..55fd4d99 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/enums/Include.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/enums/Include.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.enums; +package top.charles7c.continew.starter.log.core.enums; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRecord.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRecord.java similarity index 97% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRecord.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRecord.java index ccb944df..8b25c159 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRecord.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRecord.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.model; +package top.charles7c.continew.starter.log.core.model; -import top.charles7c.continew.starter.log.common.enums.Include; +import top.charles7c.continew.starter.log.core.enums.Include; import java.time.Clock; import java.time.Duration; diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRequest.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRequest.java similarity index 97% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRequest.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRequest.java index 65a9fd89..e3f7b629 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRequest.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRequest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.model; +package top.charles7c.continew.starter.log.core.model; import cn.hutool.core.text.CharSequenceUtil; import org.springframework.http.HttpHeaders; import top.charles7c.continew.starter.core.util.IpUtils; -import top.charles7c.continew.starter.log.common.enums.Include; +import top.charles7c.continew.starter.log.core.enums.Include; import top.charles7c.continew.starter.web.util.ServletUtils; import java.net.URI; diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogResponse.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogResponse.java similarity index 94% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogResponse.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogResponse.java index b326b3c9..27d5e9b0 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogResponse.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogResponse.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.model; +package top.charles7c.continew.starter.log.core.model; -import top.charles7c.continew.starter.log.common.enums.Include; +import top.charles7c.continew.starter.log.core.enums.Include; import java.util.*; diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpRequest.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpRequest.java similarity index 96% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpRequest.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpRequest.java index 1ae1432b..f9cbf7f1 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpRequest.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.model; +package top.charles7c.continew.starter.log.core.model; import java.net.URI; import java.util.Map; diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpResponse.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpResponse.java similarity index 95% rename from continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpResponse.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpResponse.java index 0506624d..654cd3fe 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpResponse.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.common.model; +package top.charles7c.continew.starter.log.core.model; import java.util.Map; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml b/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml index dedc0837..523d3385 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml +++ b/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml @@ -25,10 +25,10 @@ transmittable-thread-local - + top.charles7c.continew - continew-starter-log-common + continew-starter-log-core \ No newline at end of file diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java index ad686cfe..5e234ba1 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java @@ -26,8 +26,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import top.charles7c.continew.starter.log.common.dao.LogDao; -import top.charles7c.continew.starter.log.common.dao.impl.LogDaoDefaultImpl; +import top.charles7c.continew.starter.log.core.dao.LogDao; +import top.charles7c.continew.starter.log.core.dao.impl.LogDaoDefaultImpl; import top.charles7c.continew.starter.log.httptracepro.handler.LogFilter; import top.charles7c.continew.starter.log.httptracepro.handler.LogInterceptor; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogProperties.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogProperties.java index cca5241b..cf657d90 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogProperties.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogProperties.java @@ -18,7 +18,7 @@ package top.charles7c.continew.starter.log.httptracepro.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.log.common.enums.Include; +import top.charles7c.continew.starter.log.core.enums.Include; import java.util.HashSet; import java.util.Set; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogFilter.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogFilter.java index 30d4482f..51dae673 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogFilter.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogFilter.java @@ -26,7 +26,7 @@ import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.util.ContentCachingResponseWrapper; import org.springframework.web.util.WebUtils; -import top.charles7c.continew.starter.log.common.enums.Include; +import top.charles7c.continew.starter.log.core.enums.Include; import top.charles7c.continew.starter.log.httptracepro.autoconfigure.LogProperties; import java.io.IOException; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java index 605c3516..31d9b740 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java @@ -30,11 +30,11 @@ import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.lang.NonNull; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; -import top.charles7c.continew.starter.log.common.annotation.Log; -import top.charles7c.continew.starter.log.common.dao.LogDao; -import top.charles7c.continew.starter.log.common.enums.Include; -import top.charles7c.continew.starter.log.common.model.LogRecord; -import top.charles7c.continew.starter.log.common.model.LogResponse; +import top.charles7c.continew.starter.log.core.annotation.Log; +import top.charles7c.continew.starter.log.core.dao.LogDao; +import top.charles7c.continew.starter.log.core.enums.Include; +import top.charles7c.continew.starter.log.core.model.LogRecord; +import top.charles7c.continew.starter.log.core.model.LogResponse; import top.charles7c.continew.starter.log.httptracepro.autoconfigure.LogProperties; import java.time.Clock; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java index bc23fa44..0db5788e 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java @@ -25,7 +25,7 @@ import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.util.UriUtils; import org.springframework.web.util.WebUtils; import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.log.common.model.RecordableHttpRequest; +import top.charles7c.continew.starter.log.core.model.RecordableHttpRequest; import java.net.URI; import java.net.URISyntaxException; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java index 9347b906..1a6ea919 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java @@ -23,7 +23,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.util.ContentCachingResponseWrapper; import org.springframework.web.util.WebUtils; import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.log.common.model.RecordableHttpResponse; +import top.charles7c.continew.starter.log.core.model.RecordableHttpResponse; import top.charles7c.continew.starter.web.util.ServletUtils; import java.util.*; diff --git a/continew-starter-log/pom.xml b/continew-starter-log/pom.xml index 441dc5bf..4bcfe863 100644 --- a/continew-starter-log/pom.xml +++ b/continew-starter-log/pom.xml @@ -14,7 +14,7 @@ ContiNew Starter 日志模块 - continew-starter-log-common + continew-starter-log-core continew-starter-log-httptrace-pro