refactor: 移除 web-core，融合 web-core 和 core 模块

1.移除 web-core，融合 web-core 和 core 模块
2.调整部分依赖顺序

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 过滤）

continew-starter-api-doc/pom.xml

@@ -13,16 +13,16 @@
     <description>ContiNew Starter API 文档模块</description>
 
     <dependencies>
-        <!-- Knife4j（前身是 swagger-bootstrap-ui，集 Swagger2 和 OpenAPI3 为一体的增强解决方案） -->
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
-        </dependency>
-
         <!-- 核心模块 -->
         <dependency>
             <groupId>top.continew</groupId>
             <artifactId>continew-starter-core</artifactId>
         </dependency>
+
+        <!-- Knife4j（前身是 swagger-bootstrap-ui，集 Swagger2 和 OpenAPI3 为一体的增强解决方案） -->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 </project>

continew-starter-auth/continew-starter-auth-justauth/pom.xml

@@ -13,6 +13,13 @@
     <description>ContiNew Starter 认证模块 - JustAuth</description>
 
     <dependencies>
+        <!-- 缓存模块 - Redisson -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-cache-redisson</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Just Auth（开箱即用的整合第三方登录的开源组件，脱离繁琐的第三方登录 SDK，让登录变得 So easy!） -->
         <dependency>
             <groupId>me.zhyd.oauth</groupId>
@@ -23,12 +30,5 @@
             <groupId>com.xkcoding.justauth</groupId>
             <artifactId>justauth-spring-boot-starter</artifactId>
         </dependency>
-
-        <!-- 缓存模块 - Redisson -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-cache-redisson</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 </project>

continew-starter-auth/continew-starter-auth-satoken/pom.xml

@@ -13,12 +13,6 @@
     <description>ContiNew Starter 认证模块 - SaToken</description>
 
     <dependencies>
-        <!-- Web 模块 - 核心模块 -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-web-core</artifactId>
-        </dependency>
-
         <!-- 缓存模块 - Redisson -->
         <dependency>
             <groupId>top.continew</groupId>
@@ -30,12 +24,6 @@
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot3-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-web</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- Sa-Token 整合 JWT -->

continew-starter-bom/pom.xml

@@ -37,17 +37,29 @@
                 <version>${revision}</version>
             </dependency>
 
-            <!-- Web 模块 - 核心模块 -->
+            <!-- Web 模块 -->
             <dependency>
                 <groupId>top.continew</groupId>
-                <artifactId>continew-starter-web-core</artifactId>
+                <artifactId>continew-starter-web</artifactId>
                 <version>${revision}</version>
             </dependency>
 
-            <!-- Web 模块 - 增强支持模块 -->
+            <!-- 缓存模块 - Redisson -->
             <dependency>
                 <groupId>top.continew</groupId>
-                <artifactId>continew-starter-web-support</artifactId>
+                <artifactId>continew-starter-cache-redisson</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <!-- 缓存模块 - Spring Cache -->
+            <dependency>
+                <groupId>top.continew</groupId>
+                <artifactId>continew-starter-cache-springcache</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <!-- 缓存模块 - JetCache -->
+            <dependency>
+                <groupId>top.continew</groupId>
+                <artifactId>continew-starter-cache-jetcache</artifactId>
                 <version>${revision}</version>
             </dependency>
 
@@ -83,25 +95,6 @@
                 <version>${revision}</version>
             </dependency>
 
-            <!-- 缓存模块 - Redisson -->
-            <dependency>
-                <groupId>top.continew</groupId>
-                <artifactId>continew-starter-cache-redisson</artifactId>
-                <version>${revision}</version>
-            </dependency>
-            <!-- 缓存模块 - Spring Cache -->
-            <dependency>
-                <groupId>top.continew</groupId>
-                <artifactId>continew-starter-cache-springcache</artifactId>
-                <version>${revision}</version>
-            </dependency>
-            <!-- 缓存模块 - JetCache -->
-            <dependency>
-                <groupId>top.continew</groupId>
-                <artifactId>continew-starter-cache-jetcache</artifactId>
-                <version>${revision}</version>
-            </dependency>
-
             <!-- 安全模块 - 密码编码器 -->
             <dependency>
                 <groupId>top.continew</groupId>

continew-starter-cache/continew-starter-cache-jetcache/pom.xml

@@ -13,6 +13,12 @@
     <description>ContiNew Starter 缓存模块 - JetCache</description>
 
     <dependencies>
+        <!-- 缓存模块 - Redisson -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-cache-redisson</artifactId>
+        </dependency>
+
         <!-- JetCache（基于 Java 的缓存系统封装，提供统一的 API 和注解来简化缓存的使用。提供了比 SpringCache 更加强大的注解，可以原生的支持 TTL、两级缓存、分布式自动刷新，还提供了 Cache 接口用于手工缓存操作） -->
         <dependency>
             <groupId>com.alicp.jetcache</groupId>
@@ -41,11 +47,5 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
-
-        <!-- 缓存模块 - Redisson -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-cache-redisson</artifactId>
-        </dependency>
     </dependencies>
 </project>

continew-starter-captcha/continew-starter-captcha-behavior/pom.xml

@@ -13,16 +13,16 @@
     <description>ContiNew Starter 验证码模块 - 行为验证码</description>
 
     <dependencies>
-        <!-- AJ-Captcha（行为验证码，包含滑动拼图、文字点选两种方式，UI支持弹出和嵌入两种方式） -->
-        <dependency>
-            <groupId>com.anji-plus</groupId>
-            <artifactId>captcha</artifactId>
-        </dependency>
-
         <!-- 缓存模块 - Redisson -->
         <dependency>
             <groupId>top.continew</groupId>
             <artifactId>continew-starter-cache-redisson</artifactId>
         </dependency>
+
+        <!-- AJ-Captcha（行为验证码，包含滑动拼图、文字点选两种方式，UI支持弹出和嵌入两种方式） -->
+        <dependency>
+            <groupId>com.anji-plus</groupId>
+            <artifactId>captcha</artifactId>
+        </dependency>
     </dependencies>
 </project>

continew-starter-core/pom.xml

@@ -29,6 +29,24 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+        <!-- Spring Web -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <!-- Spring MVC -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+
+        <!-- Jakarta Servlet（原 Javax Servlet） -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+
         <!-- Hibernate Validator -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>

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() {

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<String, Object> getRequestParams() {
         String body = getRequestBody();
-        return CharSequenceUtil.isNotBlank(body) && JSONUtils.isTypeJSON(body)
+        return CharSequenceUtil.isNotBlank(body) && JSONUtil.isTypeJSON(body)
-            ? JSONUtils.toBean(body, Map.class)
+            ? 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<String, Object> getResponseParams() {
         String body = getResponseBody();
-        return CharSequenceUtil.isNotBlank(body) && JSONUtils.isTypeJSON(body)
+        return CharSequenceUtil.isNotBlank(body) && JSONUtil.isTypeJSON(body) ? JSONUtil.toBean(body, Map.class) : null;
-            ? JSONUtils.toBean(body, Map.class)
-            : null;
     }
 
     /**

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;

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;

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;

continew-starter-data/continew-starter-data-mf/pom.xml

@@ -13,9 +13,10 @@
     <description>ContiNew Starter 数据访问模块 - MyBatis Flex</description>
 
     <dependencies>
+        <!-- 数据访问模块 - 核心模块 -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>top.continew</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>continew-starter-data-core</artifactId>
         </dependency>
 
         <!-- MyBatis Plus（MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率） -->
@@ -29,12 +30,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- 数据访问模块 - 核心模块 -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-data-core</artifactId>
-        </dependency>
-
         <!-- CosId（通用、灵活、高性能的分布式 ID 生成器） -->
         <dependency>
             <groupId>me.ahoo.cosid</groupId>

continew-starter-data/continew-starter-data-mp/pom.xml

@@ -13,6 +13,12 @@
     <description>ContiNew Starter 数据访问模块 - MyBatis Plus</description>
 
     <dependencies>
+        <!-- 数据访问模块 - 核心模块 -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-data-core</artifactId>
+        </dependency>
+
         <!-- MyBatis Plus（MyBatis 的增强工具，在 MyBatis 的基础上只做增强不做改变，简化开发、提高效率） -->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -25,12 +31,6 @@
             <artifactId>p6spy</artifactId>
         </dependency>
 
-        <!-- 数据访问模块 - 核心模块 -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-data-core</artifactId>
-        </dependency>
-
         <!-- CosId（通用、灵活、高性能的分布式 ID 生成器） -->
         <dependency>
             <groupId>me.ahoo.cosid</groupId>

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml

@@ -13,21 +13,16 @@
     <description>ContiNew Starter 扩展模块 - CRUD（增删改查） - 核心模块</description>
 
     <dependencies>
-        <!-- Crane4j（基于注解的，用于完成一切 “根据 A 的 key 值拿到 B，再把 B 的属性映射到 A” 这类需求的字段填充框架） -->
+        <!-- API 文档模块 -->
-        <dependency>
-            <groupId>cn.crane4j</groupId>
-            <artifactId>crane4j-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-        </dependency>
-
-        <!-- Web 模块 - 增强支持模块 -->
         <dependency>
             <groupId>top.continew</groupId>
-            <artifactId>continew-starter-web-support</artifactId>
+            <artifactId>continew-starter-api-doc</artifactId>
+        </dependency>
+
+        <!-- Web 模块 -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-web</artifactId>
         </dependency>
 
         <!-- 数据访问模块 - 核心模块 -->
@@ -42,10 +37,10 @@
             <artifactId>continew-starter-file-excel</artifactId>
         </dependency>
 
-        <!-- API 文档模块 -->
+        <!-- Crane4j（基于注解的，用于完成一切 “根据 A 的 key 值拿到 B，再把 B 的属性映射到 A” 这类需求的字段填充框架） -->
         <dependency>
-            <groupId>top.continew</groupId>
+            <groupId>cn.crane4j</groupId>
-            <artifactId>continew-starter-api-doc</artifactId>
+            <artifactId>crane4j-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>
 </project>

continew-starter-file/continew-starter-file-excel/pom.xml

@@ -18,11 +18,5 @@
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
         </dependency>
-
-        <!-- Jakarta（原 Javax Servlet） -->
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-        </dependency>
     </dependencies>
 </project>

continew-starter-log/continew-starter-log-aop/pom.xml

@@ -11,7 +11,6 @@
     <artifactId>continew-starter-log-aop</artifactId>
     <description>ContiNew Starter 日志模块 - 基于 AOP 实现</description>
 
-
     <dependencies>
         <!-- 日志模块 - 核心模块 -->
         <dependency>

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.core.wrapper.RepeatReadRequestWrapper;
-import top.continew.starter.web.util.RepeatReadResponseWrapper;
+import top.continew.starter.core.wrapper.RepeatReadResponseWrapper;
 import top.continew.starter.log.model.LogProperties;
 
 import java.io.IOException;

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;

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;

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;

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;

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 cn.hutool.json.JSONUtil;
-import top.continew.starter.json.jackson.util.JSONUtils;
 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.core.util.ServletUtils;
-import top.continew.starter.web.util.SpringWebUtils;
+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 (JSONUtil.isTypeJSONArray(body)) {
-                if (jsonNode.isArray()) {
+                    return JSONUtil.toBean(body, List.class);
-                    return JSONUtils.toBean(body, List.class);
                 } else {
-                    return JSONUtils.toBean(body, Map.class);
+                    return JSONUtil.toBean(body, Map.class);
                 }
             } catch (Exception e) {
                 return null;

continew-starter-log/pom.xml

@@ -20,10 +20,10 @@
     </modules>
 
     <dependencies>
-        <!-- Web 模块 - 核心模块 -->
+        <!-- 核心模块 -->
         <dependency>
             <groupId>top.continew</groupId>
-            <artifactId>continew-starter-web-core</artifactId>
+            <artifactId>continew-starter-core</artifactId>
         </dependency>
     </dependencies>
 </project>

continew-starter-ratelimiter/pom.xml

@@ -11,10 +11,10 @@
     <description>ContiNew Starter 限流模块</description>
 
     <dependencies>
-        <!-- Web 模块 - 核心模块 -->
+        <!-- 核心模块 -->
         <dependency>
             <groupId>top.continew</groupId>
-            <artifactId>continew-starter-web-core</artifactId>
+            <artifactId>continew-starter-core</artifactId>
         </dependency>
 
         <!-- 缓存模块 - Redisson -->

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;

continew-starter-security/continew-starter-security-xss/pom.xml

@@ -11,12 +11,4 @@
 
     <artifactId>continew-starter-security-xss</artifactId>
     <description>ContiNew Starter 安全模块 - XSS 过滤模块</description>
-
-    <dependencies>
-        <!-- Web 模块 - 核心模块 -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-web-core</artifactId>
-        </dependency>
-    </dependencies>
 </project>

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;

continew-starter-storage/continew-starter-storage-core/pom.xml

@@ -12,19 +12,16 @@
     <description>ContiNew Starter 存储模块 - 核心模块</description>
 
     <dependencies>
-
+        <!-- 缓存模块 - Redisson -->
-        <!--redisson 缓存模块-->
         <dependency>
             <groupId>top.continew</groupId>
             <artifactId>continew-starter-cache-redisson</artifactId>
         </dependency>
 
-        <!--图片处理工具-主要用做图片缩略处理-->
+        <!-- Thumbnailator（缩略图生成库） -->
         <dependency>
             <groupId>net.coobird</groupId>
             <artifactId>thumbnailator</artifactId>
         </dependency>
     </dependencies>
-
-
 </project>

continew-starter-storage/continew-starter-storage-local/pom.xml

@@ -13,7 +13,7 @@
     <description>ContiNew Starter 存储模块 - 本地存储</description>
 
     <dependencies>
-        <!--存储 - 核心模块-->
+        <!-- 存储模块 - 核心模块-->
         <dependency>
             <groupId>top.continew</groupId>
             <artifactId>continew-starter-storage-core</artifactId>

continew-starter-storage/continew-starter-storage-oss/pom.xml

@@ -12,6 +12,12 @@
     <description>ContiNew Starter 存储模块 - 对象存储</description>
 
     <dependencies>
+        <!-- 存储模块 - 核心模块-->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-storage-core</artifactId>
+        </dependency>
+
         <!--  S3 SDK for Java 2.x  -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
@@ -51,13 +57,5 @@
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3-transfer-manager</artifactId>
         </dependency>
-
-        <!--存储 - 核心模块-->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-storage-core</artifactId>
-        </dependency>
-
     </dependencies>
-
 </project>

continew-starter-trace/pom.xml

@@ -19,12 +19,6 @@
             <artifactId>continew-starter-core</artifactId>
         </dependency>
 
-        <!-- Servlet API -->
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-        </dependency>
-
         <!-- TLog（轻量级的分布式日志标记追踪神器） -->
         <dependency>
             <groupId>com.yomahub</groupId>

continew-starter-web/continew-starter-web-core/pom.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>top.continew</groupId>
-        <artifactId>continew-starter-web</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>continew-starter-web-core</artifactId>
-    <description>ContiNew Starter Web 模块 - 核心模块</description>
-
-    <dependencies>
-        <!-- 核心模块 -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-core</artifactId>
-        </dependency>
-
-        <!-- JSON 模块 - Jackson -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-json-jackson</artifactId>
-        </dependency>
-
-        <!-- Spring Boot Web（提供 Spring MVC Web 开发能力，默认内置 Tomcat 服务器） -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <!-- 移除内置 Tomcat 服务器 -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Servlet API -->
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-        </dependency>
-    </dependencies>
-</project>

continew-starter-web/continew-starter-web-support/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>top.continew</groupId>
-        <artifactId>continew-starter-web</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>continew-starter-web-support</artifactId>
-    <description>ContiNew Starter Web 模块 - 增强支持模块</description>
-
-    <dependencies>
-        <!-- Web 模块 - 核心模块 -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-web-core</artifactId>
-        </dependency>
-
-        <!-- API 文档模块 -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-api-doc</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Undertow 服务器（采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制） -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-
-        <!-- Graceful Response（Spring Boot技术栈下的优雅响应处理组件，可以帮助开发者完成响应数据封装、异常处理、错误码填充等过程，提高开发效率，提高代码质量） -->
-        <dependency>
-            <groupId>com.feiniaojin</groupId>
-            <artifactId>graceful-response</artifactId>
-        </dependency>
-    </dependencies>
-</project>

continew-starter-web/pom.xml

@@ -9,12 +9,46 @@
         <version>${revision}</version>
     </parent>
 
-    <packaging>pom</packaging>
     <artifactId>continew-starter-web</artifactId>
     <description>ContiNew Starter Web 模块</description>
 
-    <modules>
+    <dependencies>
-        <module>continew-starter-web-core</module>
+        <!-- JSON 模块 - Jackson -->
-        <module>continew-starter-web-support</module>
+        <dependency>
-    </modules>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-json-jackson</artifactId>
+        </dependency>
+
+        <!-- API 文档模块 -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-api-doc</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Spring Boot Web（提供 Spring MVC Web 开发能力，默认内置 Tomcat 服务器） -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <!-- 移除内置 Tomcat 服务器 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Undertow 服务器（采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制） -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+        <!-- Graceful Response（一个Spring Boot技术栈下的优雅响应处理组件，可以帮助开发者完成响应数据封装、异常处理、错误码填充等过程，提高开发效率，提高代码质量） -->
+        <dependency>
+            <groupId>com.feiniaojin</groupId>
+            <artifactId>graceful-response</artifactId>
+        </dependency>
+    </dependencies>
 </project>

pom.xml

@@ -38,9 +38,9 @@
         <module>continew-starter-json</module>
         <module>continew-starter-api-doc</module>
         <module>continew-starter-web</module>
+        <module>continew-starter-cache</module>
         <module>continew-starter-auth</module>
         <module>continew-starter-data</module>
-        <module>continew-starter-cache</module>
         <module>continew-starter-security</module>
         <module>continew-starter-ratelimiter</module>
         <module>continew-starter-idempotent</module>