diff --git a/README.md b/README.md index b0293c8f..d62dd0a0 100644 --- a/README.md +++ b/README.md @@ -153,6 +153,10 @@ continew-starter │ └─ continew-starter-json-jackson ├─ continew-starter-api-doc(接口文档模块:Spring Doc + Knife4j) ├─ continew-starter-web(Web 开发模块:包含跨域、全局异常+响应、链路追踪等自动配置) +├─ continew-starter-cache(缓存模块) +│ ├─ continew-starter-cache-redisson(Redisson) +│ ├─ continew-starter-cache-jetcache(JetCache 多级缓存) +│ └─ continew-starter-cache-springcache(Spring 缓存) ├─ continew-starter-auth(认证模块) │ ├─ continew-starter-auth-satoken(国产轻量认证鉴权) │ └─ continew-starter-auth-justauth(第三方登录) @@ -160,10 +164,6 @@ continew-starter │ ├─ continew-starter-data-core(通用模块) │ ├─ continew-starter-data-mp(MyBatis Plus) │ └─ continew-starter-data-mf(MyBatis Flex) -├─ continew-starter-cache(缓存模块) -│ ├─ continew-starter-cache-redisson(Redisson) -│ ├─ continew-starter-cache-jetcache(JetCache 多级缓存) -│ └─ continew-starter-cache-springcache(Spring 缓存) ├─ continew-starter-security(安全模块) │ ├─ continew-starter-security-crypto(加密:字段加解密) │ ├─ continew-starter-security-xss(XSS 过滤) diff --git a/continew-starter-api-doc/pom.xml b/continew-starter-api-doc/pom.xml index adf812cd..3815a37f 100644 --- a/continew-starter-api-doc/pom.xml +++ b/continew-starter-api-doc/pom.xml @@ -13,16 +13,16 @@ ContiNew Starter API 文档模块 - - - com.github.xiaoymin - knife4j-openapi3-jakarta-spring-boot-starter - - top.continew continew-starter-core + + + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + \ No newline at end of file diff --git a/continew-starter-auth/continew-starter-auth-justauth/pom.xml b/continew-starter-auth/continew-starter-auth-justauth/pom.xml index 3928cc06..6340c01c 100644 --- a/continew-starter-auth/continew-starter-auth-justauth/pom.xml +++ b/continew-starter-auth/continew-starter-auth-justauth/pom.xml @@ -13,6 +13,13 @@ ContiNew Starter 认证模块 - JustAuth + + + top.continew + continew-starter-cache-redisson + true + + me.zhyd.oauth @@ -23,12 +30,5 @@ com.xkcoding.justauth justauth-spring-boot-starter - - - - top.continew - continew-starter-cache-redisson - true - \ No newline at end of file diff --git a/continew-starter-auth/continew-starter-auth-satoken/pom.xml b/continew-starter-auth/continew-starter-auth-satoken/pom.xml index a771992c..2ca80d80 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/pom.xml +++ b/continew-starter-auth/continew-starter-auth-satoken/pom.xml @@ -13,12 +13,6 @@ ContiNew Starter 认证模块 - SaToken - - - top.continew - continew-starter-web-core - - top.continew @@ -30,12 +24,6 @@ cn.dev33 sa-token-spring-boot3-starter - - - org.springframework.boot - spring-boot-starter-web - - diff --git a/continew-starter-bom/pom.xml b/continew-starter-bom/pom.xml index 97bbae4e..97727bf6 100644 --- a/continew-starter-bom/pom.xml +++ b/continew-starter-bom/pom.xml @@ -37,17 +37,29 @@ ${revision} - + top.continew - continew-starter-web-core + continew-starter-web ${revision} - + top.continew - continew-starter-web-support + continew-starter-cache-redisson + ${revision} + + + + top.continew + continew-starter-cache-springcache + ${revision} + + + + top.continew + continew-starter-cache-jetcache ${revision} @@ -83,25 +95,6 @@ ${revision} - - - top.continew - continew-starter-cache-redisson - ${revision} - - - - top.continew - continew-starter-cache-springcache - ${revision} - - - - top.continew - continew-starter-cache-jetcache - ${revision} - - top.continew diff --git a/continew-starter-cache/continew-starter-cache-jetcache/pom.xml b/continew-starter-cache/continew-starter-cache-jetcache/pom.xml index 3f503238..dbb321c5 100644 --- a/continew-starter-cache/continew-starter-cache-jetcache/pom.xml +++ b/continew-starter-cache/continew-starter-cache-jetcache/pom.xml @@ -13,6 +13,12 @@ ContiNew Starter 缓存模块 - JetCache + + + top.continew + continew-starter-cache-redisson + + com.alicp.jetcache @@ -41,11 +47,5 @@ org.apache.commons commons-pool2 - - - - top.continew - continew-starter-cache-redisson - \ No newline at end of file diff --git a/continew-starter-captcha/continew-starter-captcha-behavior/pom.xml b/continew-starter-captcha/continew-starter-captcha-behavior/pom.xml index f52e305f..52e7ce47 100644 --- a/continew-starter-captcha/continew-starter-captcha-behavior/pom.xml +++ b/continew-starter-captcha/continew-starter-captcha-behavior/pom.xml @@ -13,16 +13,16 @@ ContiNew Starter 验证码模块 - 行为验证码 - - - com.anji-plus - captcha - - top.continew continew-starter-cache-redisson + + + + com.anji-plus + captcha + \ No newline at end of file diff --git a/continew-starter-core/pom.xml b/continew-starter-core/pom.xml index 6b28fe44..7e7a6ff4 100644 --- a/continew-starter-core/pom.xml +++ b/continew-starter-core/pom.xml @@ -29,6 +29,24 @@ spring-boot-starter-aop + + + org.springframework + spring-web + + + + + org.springframework + spring-webmvc + + + + + jakarta.servlet + jakarta.servlet-api + + org.hibernate.validator diff --git a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/FileUploadUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/FileUploadUtils.java similarity index 98% rename from continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/FileUploadUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/FileUploadUtils.java index e8331453..3f42de68 100644 --- a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/FileUploadUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/FileUploadUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.web.util; +package top.continew.starter.core.util; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; @@ -43,6 +43,7 @@ import java.time.LocalDateTime; * @since 1.0.0 */ public class FileUploadUtils { + private static final Logger log = LoggerFactory.getLogger(FileUploadUtils.class); private FileUploadUtils() { diff --git a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/ServletUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/ServletUtils.java similarity index 94% rename from continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/ServletUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/ServletUtils.java index ecdebdb7..edfb815a 100644 --- a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/ServletUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/ServletUtils.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package top.continew.starter.web.util; +package top.continew.starter.core.util; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; +import cn.hutool.json.JSONUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; @@ -29,7 +30,8 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.util.UriUtils; import top.continew.starter.core.constant.StringConstants; -import top.continew.starter.json.jackson.util.JSONUtils; +import top.continew.starter.core.wrapper.RepeatReadRequestWrapper; +import top.continew.starter.core.wrapper.RepeatReadResponseWrapper; import java.net.URI; import java.net.URISyntaxException; @@ -204,7 +206,7 @@ public class ServletUtils extends JakartaServletUtil { HttpServletRequest request = getRequest(); if (request instanceof RepeatReadRequestWrapper wrapper && !wrapper.isMultipartContent(request)) { String body = JakartaServletUtil.getBody(request); - return JSONUtils.isTypeJSON(body) ? body : null; + return JSONUtil.isTypeJSON(body) ? body : null; } return null; } @@ -217,8 +219,8 @@ public class ServletUtils extends JakartaServletUtil { */ public static Map getRequestParams() { String body = getRequestBody(); - return CharSequenceUtil.isNotBlank(body) && JSONUtils.isTypeJSON(body) - ? JSONUtils.toBean(body, Map.class) + return CharSequenceUtil.isNotBlank(body) && JSONUtil.isTypeJSON(body) + ? JSONUtil.toBean(body, Map.class) : Collections.unmodifiableMap(JakartaServletUtil.getParamMap(Objects.requireNonNull(getRequest()))); } @@ -262,7 +264,7 @@ public class ServletUtils extends JakartaServletUtil { HttpServletResponse response = getResponse(); if (response instanceof RepeatReadResponseWrapper wrapper && !wrapper.isStreamingResponse()) { String body = wrapper.getResponseContent(); - return JSONUtils.isTypeJSON(body) ? body : null; + return JSONUtil.isTypeJSON(body) ? body : null; } return null; } @@ -275,9 +277,7 @@ public class ServletUtils extends JakartaServletUtil { */ public static Map getResponseParams() { String body = getResponseBody(); - return CharSequenceUtil.isNotBlank(body) && JSONUtils.isTypeJSON(body) - ? JSONUtils.toBean(body, Map.class) - : null; + return CharSequenceUtil.isNotBlank(body) && JSONUtil.isTypeJSON(body) ? JSONUtil.toBean(body, Map.class) : null; } /** diff --git a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/SpringWebUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/SpringWebUtils.java similarity index 99% rename from continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/SpringWebUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/SpringWebUtils.java index f98e6e70..e687f9dc 100644 --- a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/SpringWebUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/SpringWebUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.web.util; +package top.continew.starter.core.util; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ReflectUtil; diff --git a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadRequestWrapper.java b/continew-starter-core/src/main/java/top/continew/starter/core/wrapper/RepeatReadRequestWrapper.java similarity index 98% rename from continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadRequestWrapper.java rename to continew-starter-core/src/main/java/top/continew/starter/core/wrapper/RepeatReadRequestWrapper.java index 5bb3a1d7..34b77c14 100644 --- a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadRequestWrapper.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/wrapper/RepeatReadRequestWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.web.util; +package top.continew.starter.core.wrapper; import cn.hutool.core.io.IoUtil; import jakarta.servlet.ReadListener; diff --git a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadResponseWrapper.java b/continew-starter-core/src/main/java/top/continew/starter/core/wrapper/RepeatReadResponseWrapper.java similarity index 99% rename from continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadResponseWrapper.java rename to continew-starter-core/src/main/java/top/continew/starter/core/wrapper/RepeatReadResponseWrapper.java index c64e6bd3..33b065c8 100644 --- a/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadResponseWrapper.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/wrapper/RepeatReadResponseWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.starter.web.util; +package top.continew.starter.core.wrapper; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; diff --git a/continew-starter-data/continew-starter-data-mf/pom.xml b/continew-starter-data/continew-starter-data-mf/pom.xml index bbc3a57f..f2339319 100644 --- a/continew-starter-data/continew-starter-data-mf/pom.xml +++ b/continew-starter-data/continew-starter-data-mf/pom.xml @@ -13,9 +13,10 @@ ContiNew Starter 数据访问模块 - MyBatis Flex + - org.springframework.boot - spring-boot-starter-aop + top.continew + continew-starter-data-core @@ -29,12 +30,6 @@ provided - - - top.continew - continew-starter-data-core - - me.ahoo.cosid diff --git a/continew-starter-data/continew-starter-data-mp/pom.xml b/continew-starter-data/continew-starter-data-mp/pom.xml index e7eb1bc8..afa6d41b 100644 --- a/continew-starter-data/continew-starter-data-mp/pom.xml +++ b/continew-starter-data/continew-starter-data-mp/pom.xml @@ -13,6 +13,12 @@ ContiNew Starter 数据访问模块 - MyBatis Plus + + + top.continew + continew-starter-data-core + + com.baomidou @@ -25,12 +31,6 @@ p6spy - - - top.continew - continew-starter-data-core - - me.ahoo.cosid diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml index e5e5e3d2..004b6495 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml @@ -13,21 +13,16 @@ ContiNew Starter 扩展模块 - CRUD(增删改查) - 核心模块 - - - cn.crane4j - crane4j-spring-boot-starter - - - - org.springframework.data - spring-data-commons - - - + top.continew - continew-starter-web-support + continew-starter-api-doc + + + + + top.continew + continew-starter-web @@ -42,10 +37,10 @@ continew-starter-file-excel - + - top.continew - continew-starter-api-doc + cn.crane4j + crane4j-spring-boot-starter \ No newline at end of file diff --git a/continew-starter-file/continew-starter-file-excel/pom.xml b/continew-starter-file/continew-starter-file-excel/pom.xml index d74296f4..250391b0 100644 --- a/continew-starter-file/continew-starter-file-excel/pom.xml +++ b/continew-starter-file/continew-starter-file-excel/pom.xml @@ -18,11 +18,5 @@ com.alibaba easyexcel - - - - jakarta.servlet - jakarta.servlet-api - \ No newline at end of file diff --git a/continew-starter-log/continew-starter-log-aop/pom.xml b/continew-starter-log/continew-starter-log-aop/pom.xml index bbec9a19..e193e2b8 100644 --- a/continew-starter-log/continew-starter-log-aop/pom.xml +++ b/continew-starter-log/continew-starter-log-aop/pom.xml @@ -11,7 +11,6 @@ continew-starter-log-aop ContiNew Starter 日志模块 - 基于 AOP 实现 - diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/filter/LogFilter.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/filter/LogFilter.java index e1a25077..334efea9 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/filter/LogFilter.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/filter/LogFilter.java @@ -25,8 +25,8 @@ import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.core.Ordered; import org.springframework.lang.NonNull; import org.springframework.web.filter.OncePerRequestFilter; -import top.continew.starter.web.util.RepeatReadRequestWrapper; -import top.continew.starter.web.util.RepeatReadResponseWrapper; +import top.continew.starter.core.wrapper.RepeatReadRequestWrapper; +import top.continew.starter.core.wrapper.RepeatReadResponseWrapper; import top.continew.starter.log.model.LogProperties; import java.io.IOException; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/handler/AbstractLogHandler.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/handler/AbstractLogHandler.java index d492d6bd..86c82e3f 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/handler/AbstractLogHandler.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/handler/AbstractLogHandler.java @@ -31,7 +31,7 @@ import top.continew.starter.log.model.AccessLogContext; import top.continew.starter.log.model.AccessLogProperties; import top.continew.starter.log.model.LogRecord; import top.continew.starter.log.util.AccessLogUtils; -import top.continew.starter.web.util.ServletUtils; +import top.continew.starter.core.util.ServletUtils; import java.lang.reflect.Method; import java.time.Duration; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogProperties.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogProperties.java index 30645034..1d344c33 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogProperties.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogProperties.java @@ -20,7 +20,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import top.continew.starter.core.constant.PropertiesConstants; import top.continew.starter.log.enums.Include; -import top.continew.starter.web.util.SpringWebUtils; +import top.continew.starter.core.util.SpringWebUtils; import java.util.ArrayList; import java.util.List; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogRequest.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogRequest.java index 1b5ae1df..6ecf4222 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogRequest.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogRequest.java @@ -20,7 +20,7 @@ import cn.hutool.core.text.CharSequenceUtil; import org.springframework.http.HttpHeaders; import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.IpUtils; -import top.continew.starter.web.util.ServletUtils; +import top.continew.starter.core.util.ServletUtils; import top.continew.starter.log.enums.Include; import java.net.URI; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogResponse.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogResponse.java index 3bd7bbc1..59c73734 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogResponse.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/model/LogResponse.java @@ -17,7 +17,7 @@ package top.continew.starter.log.model; import top.continew.starter.log.enums.Include; -import top.continew.starter.web.util.ServletUtils; +import top.continew.starter.core.util.ServletUtils; import java.util.Map; import java.util.Set; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/util/AccessLogUtils.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/util/AccessLogUtils.java index b57dfa49..9db8f446 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/util/AccessLogUtils.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/util/AccessLogUtils.java @@ -18,12 +18,11 @@ package top.continew.starter.log.util; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; -import com.fasterxml.jackson.databind.JsonNode; -import top.continew.starter.json.jackson.util.JSONUtils; +import cn.hutool.json.JSONUtil; import top.continew.starter.log.model.AccessLogProperties; import top.continew.starter.log.model.LogProperties; -import top.continew.starter.web.util.ServletUtils; -import top.continew.starter.web.util.SpringWebUtils; +import top.continew.starter.core.util.ServletUtils; +import top.continew.starter.core.util.SpringWebUtils; import java.util.*; import java.util.stream.Collectors; @@ -79,7 +78,7 @@ public class AccessLogUtils { params = processTruncateLongParams(params, properties.getLongParamThreshold(), properties .getLongParamMaxLength(), properties.getLongParamSuffix()); } - return JSONUtils.toJsonStr(params); + return JSONUtil.toJsonStr(params); } /** @@ -192,13 +191,12 @@ public class AccessLogUtils { */ private static Object getAccessLogReqParam() { String body = ServletUtils.getRequestBody(); - if (CharSequenceUtil.isNotBlank(body) && JSONUtils.isTypeJSON(body)) { + if (CharSequenceUtil.isNotBlank(body) && JSONUtil.isTypeJSON(body)) { try { - JsonNode jsonNode = JSONUtils.getObjectMapper().readTree(body); - if (jsonNode.isArray()) { - return JSONUtils.toBean(body, List.class); + if (JSONUtil.isTypeJSONArray(body)) { + return JSONUtil.toBean(body, List.class); } else { - return JSONUtils.toBean(body, Map.class); + return JSONUtil.toBean(body, Map.class); } } catch (Exception e) { return null; diff --git a/continew-starter-log/pom.xml b/continew-starter-log/pom.xml index 72f88fec..f979c041 100644 --- a/continew-starter-log/pom.xml +++ b/continew-starter-log/pom.xml @@ -20,10 +20,10 @@ - + top.continew - continew-starter-web-core + continew-starter-core \ No newline at end of file diff --git a/continew-starter-ratelimiter/pom.xml b/continew-starter-ratelimiter/pom.xml index cddcc561..257e3d4a 100644 --- a/continew-starter-ratelimiter/pom.xml +++ b/continew-starter-ratelimiter/pom.xml @@ -11,10 +11,10 @@ ContiNew Starter 限流模块 - + top.continew - continew-starter-web-core + continew-starter-core diff --git a/continew-starter-ratelimiter/src/main/java/top/continew/starter/ratelimiter/aop/RateLimiterAspect.java b/continew-starter-ratelimiter/src/main/java/top/continew/starter/ratelimiter/aop/RateLimiterAspect.java index 34984530..15d0b7cf 100644 --- a/continew-starter-ratelimiter/src/main/java/top/continew/starter/ratelimiter/aop/RateLimiterAspect.java +++ b/continew-starter-ratelimiter/src/main/java/top/continew/starter/ratelimiter/aop/RateLimiterAspect.java @@ -34,7 +34,7 @@ import top.continew.starter.ratelimiter.autoconfigure.RateLimiterProperties; import top.continew.starter.ratelimiter.generator.RateLimiterNameGenerator; import top.continew.starter.ratelimiter.enums.LimitType; import top.continew.starter.ratelimiter.exception.RateLimiterException; -import top.continew.starter.web.util.ServletUtils; +import top.continew.starter.core.util.ServletUtils; import java.lang.reflect.Method; import java.time.Duration; diff --git a/continew-starter-security/continew-starter-security-xss/pom.xml b/continew-starter-security/continew-starter-security-xss/pom.xml index 97b715a8..527f751d 100644 --- a/continew-starter-security/continew-starter-security-xss/pom.xml +++ b/continew-starter-security/continew-starter-security-xss/pom.xml @@ -11,12 +11,4 @@ continew-starter-security-xss ContiNew Starter 安全模块 - XSS 过滤模块 - - - - - top.continew - continew-starter-web-core - - \ No newline at end of file diff --git a/continew-starter-security/continew-starter-security-xss/src/main/java/top/continew/starter/security/xss/filter/XssFilter.java b/continew-starter-security/continew-starter-security-xss/src/main/java/top/continew/starter/security/xss/filter/XssFilter.java index 7f5f7b3e..48cb4678 100644 --- a/continew-starter-security/continew-starter-security-xss/src/main/java/top/continew/starter/security/xss/filter/XssFilter.java +++ b/continew-starter-security/continew-starter-security-xss/src/main/java/top/continew/starter/security/xss/filter/XssFilter.java @@ -22,7 +22,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import top.continew.starter.security.xss.autoconfigure.XssProperties; -import top.continew.starter.web.util.SpringWebUtils; +import top.continew.starter.core.util.SpringWebUtils; import java.io.IOException; import java.util.List; diff --git a/continew-starter-storage/continew-starter-storage-core/pom.xml b/continew-starter-storage/continew-starter-storage-core/pom.xml index 2c54c40b..e79c5661 100644 --- a/continew-starter-storage/continew-starter-storage-core/pom.xml +++ b/continew-starter-storage/continew-starter-storage-core/pom.xml @@ -12,19 +12,16 @@ ContiNew Starter 存储模块 - 核心模块 - - + top.continew continew-starter-cache-redisson - + net.coobird thumbnailator - - diff --git a/continew-starter-storage/continew-starter-storage-local/pom.xml b/continew-starter-storage/continew-starter-storage-local/pom.xml index 8d2638ea..1adcc025 100644 --- a/continew-starter-storage/continew-starter-storage-local/pom.xml +++ b/continew-starter-storage/continew-starter-storage-local/pom.xml @@ -13,7 +13,7 @@ ContiNew Starter 存储模块 - 本地存储 - + top.continew continew-starter-storage-core diff --git a/continew-starter-storage/continew-starter-storage-oss/pom.xml b/continew-starter-storage/continew-starter-storage-oss/pom.xml index d4d8734b..357e0887 100644 --- a/continew-starter-storage/continew-starter-storage-oss/pom.xml +++ b/continew-starter-storage/continew-starter-storage-oss/pom.xml @@ -12,6 +12,12 @@ ContiNew Starter 存储模块 - 对象存储 + + + top.continew + continew-starter-storage-core + + software.amazon.awssdk @@ -51,13 +57,5 @@ software.amazon.awssdk s3-transfer-manager - - - - top.continew - continew-starter-storage-core - - - diff --git a/continew-starter-trace/pom.xml b/continew-starter-trace/pom.xml index afe9d4d8..f594afc1 100644 --- a/continew-starter-trace/pom.xml +++ b/continew-starter-trace/pom.xml @@ -19,12 +19,6 @@ continew-starter-core - - - jakarta.servlet - jakarta.servlet-api - - com.yomahub diff --git a/continew-starter-web/continew-starter-web-core/pom.xml b/continew-starter-web/continew-starter-web-core/pom.xml deleted file mode 100644 index 473ca932..00000000 --- a/continew-starter-web/continew-starter-web-core/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - top.continew - continew-starter-web - ${revision} - - - continew-starter-web-core - ContiNew Starter Web 模块 - 核心模块 - - - - - top.continew - continew-starter-core - - - - - top.continew - continew-starter-json-jackson - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - - - jakarta.servlet - jakarta.servlet-api - - - diff --git a/continew-starter-web/continew-starter-web-support/pom.xml b/continew-starter-web/continew-starter-web-support/pom.xml deleted file mode 100644 index 1b3efa93..00000000 --- a/continew-starter-web/continew-starter-web-support/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - top.continew - continew-starter-web - ${revision} - - - continew-starter-web-support - ContiNew Starter Web 模块 - 增强支持模块 - - - - - top.continew - continew-starter-web-core - - - - - top.continew - continew-starter-api-doc - true - - - - - org.springframework.boot - spring-boot-starter-undertow - - - - - com.feiniaojin - graceful-response - - - diff --git a/continew-starter-web/pom.xml b/continew-starter-web/pom.xml index 3b3a6c92..2c1e28b2 100644 --- a/continew-starter-web/pom.xml +++ b/continew-starter-web/pom.xml @@ -9,12 +9,46 @@ ${revision} - pom continew-starter-web ContiNew Starter Web 模块 - - continew-starter-web-core - continew-starter-web-support - + + + + top.continew + continew-starter-json-jackson + + + + + top.continew + continew-starter-api-doc + true + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + + org.springframework.boot + spring-boot-starter-undertow + + + + + com.feiniaojin + graceful-response + + \ No newline at end of file diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java b/continew-starter-web/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java rename to continew-starter-web/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/model/R.java b/continew-starter-web/src/main/java/top/continew/starter/web/model/R.java similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/model/R.java rename to continew-starter-web/src/main/java/top/continew/starter/web/model/R.java diff --git a/continew-starter-web/continew-starter-web-support/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to continew-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/continew-starter-web/continew-starter-web-support/src/main/resources/default-web.yml b/continew-starter-web/src/main/resources/default-web.yml similarity index 100% rename from continew-starter-web/continew-starter-web-support/src/main/resources/default-web.yml rename to continew-starter-web/src/main/resources/default-web.yml diff --git a/pom.xml b/pom.xml index 7fe6e727..cc10a76b 100644 --- a/pom.xml +++ b/pom.xml @@ -38,9 +38,9 @@ continew-starter-json continew-starter-api-doc continew-starter-web + continew-starter-cache continew-starter-auth continew-starter-data - continew-starter-cache continew-starter-security continew-starter-ratelimiter continew-starter-idempotent