From 9c6182e028734982eda131a5ff47a5e0ceec82e2 Mon Sep 17 00:00:00 2001 From: liquor <958142070@qq.com> Date: Tue, 20 May 2025 14:58:38 +0000 Subject: [PATCH] =?UTF-8?q?refactor(web):=20=E6=8B=86=E5=88=86=20web=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../continew-starter-auth-satoken/pom.xml | 2 +- continew-starter-bom/pom.xml | 11 +++- .../pom.xml | 4 +- continew-starter-log/pom.xml | 2 +- continew-starter-ratelimiter/pom.xml | 2 +- .../continew-starter-security-xss/pom.xml | 2 +- continew-starter-trace/pom.xml | 10 +++- .../continew-starter-web-core/pom.xml | 51 +++++++++++++++++++ .../starter/web/util/FileUploadUtils.java | 0 .../web/util/RepeatReadRequestWrapper.java | 0 .../web/util/RepeatReadResponseWrapper.java | 0 .../starter/web/util/ServletUtils.java | 0 .../starter/web/util/SpringWebUtils.java | 0 .../continew-starter-web-support/pom.xml | 44 ++++++++++++++++ .../web/annotation/EnableGlobalResponse.java | 0 .../cors/CorsAutoConfiguration.java | 0 .../autoconfigure/cors/CorsProperties.java | 0 .../mvc/WebMvcAutoConfiguration.java | 0 .../mvc/converter/BaseEnumConverter.java | 0 .../converter/BaseEnumConverterFactory.java | 0 .../mvc/converter/time/DateConverter.java | 0 .../converter/time/LocalDateConverter.java | 0 .../time/LocalDateTimeConverter.java | 0 .../converter/time/LocalTimeConverter.java | 0 .../response/ApiDocGlobalResponseHandler.java | 0 ...aultBeforeControllerAdviceProcessImpl.java | 0 .../GlobalResponseAutoConfiguration.java | 0 .../response/GlobalResponseProperties.java | 0 .../server/ServerExtensionProperties.java | 0 .../server/UndertowAutoConfiguration.java | 0 .../top/continew/starter/web/model/R.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../src/main/resources/default-web.yml | 0 continew-starter-web/pom.xml | 44 ++-------------- 34 files changed, 123 insertions(+), 49 deletions(-) create mode 100644 continew-starter-web/continew-starter-web-core/pom.xml rename continew-starter-web/{ => continew-starter-web-core}/src/main/java/top/continew/starter/web/util/FileUploadUtils.java (100%) rename continew-starter-web/{ => continew-starter-web-core}/src/main/java/top/continew/starter/web/util/RepeatReadRequestWrapper.java (100%) rename continew-starter-web/{ => continew-starter-web-core}/src/main/java/top/continew/starter/web/util/RepeatReadResponseWrapper.java (100%) rename continew-starter-web/{ => continew-starter-web-core}/src/main/java/top/continew/starter/web/util/ServletUtils.java (100%) rename continew-starter-web/{ => continew-starter-web-core}/src/main/java/top/continew/starter/web/util/SpringWebUtils.java (100%) create mode 100644 continew-starter-web/continew-starter-web-support/pom.xml rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/java/top/continew/starter/web/model/R.java (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename continew-starter-web/{ => continew-starter-web-support}/src/main/resources/default-web.yml (100%) diff --git a/continew-starter-auth/continew-starter-auth-satoken/pom.xml b/continew-starter-auth/continew-starter-auth-satoken/pom.xml index c7fac145..41e0e9a1 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/pom.xml +++ b/continew-starter-auth/continew-starter-auth-satoken/pom.xml @@ -16,7 +16,7 @@ top.continew - continew-starter-web + continew-starter-web-core diff --git a/continew-starter-bom/pom.xml b/continew-starter-bom/pom.xml index 11cf7625..97bbae4e 100644 --- a/continew-starter-bom/pom.xml +++ b/continew-starter-bom/pom.xml @@ -37,10 +37,17 @@ ${revision} - + top.continew - continew-starter-web + continew-starter-web-core + ${revision} + + + + + top.continew + continew-starter-web-support ${revision} 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 1081c735..e5e5e3d2 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 @@ -24,10 +24,10 @@ spring-data-commons - + top.continew - continew-starter-web + continew-starter-web-support diff --git a/continew-starter-log/pom.xml b/continew-starter-log/pom.xml index 2b7ec476..32035c1e 100644 --- a/continew-starter-log/pom.xml +++ b/continew-starter-log/pom.xml @@ -23,7 +23,7 @@ top.continew - continew-starter-web + continew-starter-web-core \ No newline at end of file diff --git a/continew-starter-ratelimiter/pom.xml b/continew-starter-ratelimiter/pom.xml index 308aa438..1186d702 100644 --- a/continew-starter-ratelimiter/pom.xml +++ b/continew-starter-ratelimiter/pom.xml @@ -14,7 +14,7 @@ top.continew - continew-starter-web + continew-starter-web-core diff --git a/continew-starter-security/continew-starter-security-xss/pom.xml b/continew-starter-security/continew-starter-security-xss/pom.xml index 4533004c..59dbcb4f 100644 --- a/continew-starter-security/continew-starter-security-xss/pom.xml +++ b/continew-starter-security/continew-starter-security-xss/pom.xml @@ -16,7 +16,7 @@ top.continew - continew-starter-web + continew-starter-web-core \ No newline at end of file diff --git a/continew-starter-trace/pom.xml b/continew-starter-trace/pom.xml index d805a58b..4b93dc76 100644 --- a/continew-starter-trace/pom.xml +++ b/continew-starter-trace/pom.xml @@ -13,10 +13,16 @@ ContiNew Starter 链路追踪模块 - + + + jakarta.servlet + jakarta.servlet-api + + + top.continew - continew-starter-web + continew-starter-core diff --git a/continew-starter-web/continew-starter-web-core/pom.xml b/continew-starter-web/continew-starter-web-core/pom.xml new file mode 100644 index 00000000..002020a0 --- /dev/null +++ b/continew-starter-web/continew-starter-web-core/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + top.continew + continew-starter-web + ${revision} + + + continew-starter-web-core + ContiNew Starter Web 模块 - 核心模块 + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + + jakarta.servlet + jakarta.servlet-api + + + + + top.continew + continew-starter-core + + + + + top.continew + continew-starter-json-jackson + + + + + + + diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/util/FileUploadUtils.java b/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/FileUploadUtils.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/util/FileUploadUtils.java rename to continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/FileUploadUtils.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/util/RepeatReadRequestWrapper.java b/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadRequestWrapper.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/util/RepeatReadRequestWrapper.java rename to continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadRequestWrapper.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/util/RepeatReadResponseWrapper.java b/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadResponseWrapper.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/util/RepeatReadResponseWrapper.java rename to continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/RepeatReadResponseWrapper.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/util/ServletUtils.java b/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/ServletUtils.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/util/ServletUtils.java rename to continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/ServletUtils.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/util/SpringWebUtils.java b/continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/SpringWebUtils.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/util/SpringWebUtils.java rename to continew-starter-web/continew-starter-web-core/src/main/java/top/continew/starter/web/util/SpringWebUtils.java diff --git a/continew-starter-web/continew-starter-web-support/pom.xml b/continew-starter-web/continew-starter-web-support/pom.xml new file mode 100644 index 00000000..70f88402 --- /dev/null +++ b/continew-starter-web/continew-starter-web-support/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + + top.continew + continew-starter-web + ${revision} + + + continew-starter-web-support + ContiNew Starter Web 模块 - 增强支持模块 + + + + + top.continew + continew-starter-web-core + + + + + org.springframework.boot + spring-boot-starter-undertow + + + + + com.feiniaojin + graceful-response + + + + + top.continew + continew-starter-api-doc + true + + + + + + diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/annotation/EnableGlobalResponse.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/WebMvcAutoConfiguration.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverter.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/BaseEnumConverterFactory.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/DateConverter.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateConverter.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalDateTimeConverter.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/mvc/converter/time/LocalTimeConverter.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/ApiDocGlobalResponseHandler.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/DefaultBeforeControllerAdviceProcessImpl.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseAutoConfiguration.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/response/GlobalResponseProperties.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/server/ServerExtensionProperties.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/autoconfigure/server/UndertowAutoConfiguration.java diff --git a/continew-starter-web/src/main/java/top/continew/starter/web/model/R.java b/continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/model/R.java similarity index 100% rename from continew-starter-web/src/main/java/top/continew/starter/web/model/R.java rename to continew-starter-web/continew-starter-web-support/src/main/java/top/continew/starter/web/model/R.java diff --git a/continew-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-web/continew-starter-web-support/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from continew-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to continew-starter-web/continew-starter-web-support/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/continew-starter-web/src/main/resources/default-web.yml b/continew-starter-web/continew-starter-web-support/src/main/resources/default-web.yml similarity index 100% rename from continew-starter-web/src/main/resources/default-web.yml rename to continew-starter-web/continew-starter-web-support/src/main/resources/default-web.yml diff --git a/continew-starter-web/pom.xml b/continew-starter-web/pom.xml index 38076912..3b3a6c92 100644 --- a/continew-starter-web/pom.xml +++ b/continew-starter-web/pom.xml @@ -9,46 +9,12 @@ ${revision} + pom continew-starter-web ContiNew Starter Web 模块 - - - - 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 - - - - - top.continew - continew-starter-api-doc - true - - - - - top.continew - continew-starter-json-jackson - - + + continew-starter-web-core + continew-starter-web-support + \ No newline at end of file