diff --git a/continew-starter-auth/continew-starter-auth-satoken/pom.xml b/continew-starter-auth/continew-starter-auth-satoken/pom.xml index c7fac145a026aa0bc4ec6d73cf6dbd5bf8d2c8d2..41e0e9a1aef794ddfad03ee61b5b98980d477a17 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 11cf7625e2c740b961c6c69617b16af4b8b7cd88..97bbae4e653cf960996e476c9f89ca4be3cdc1e2 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 1081c7358e0ea88daa5fa080d44982a5963d90c8..e5e5e3d248834af1d0c08dde9acf3e68ffdec869 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 2b7ec47636a97b8648b46ae5c4676f62b1ad807a..32035c1e1965f147cabfe7604f3782f390499d17 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 308aa438c1ec7e5d18d49fad6f4f0a2eb91e80f1..1186d702863f65e43675b76254b8df0162172ece 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 4533004c2e8c726e1d9fdda720afaa424ddb51ab..59dbcb4f6de2fef2b38fbf62e7a6812583807457 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 d805a58b4b5e82be213e04909f39c1a3ca3ce91e..4b93dc7631cb78c2835afc9122dce806dce99744 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 0000000000000000000000000000000000000000..002020a0aa72cd32554baaec6bfd6ff94acf0784 --- /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 0000000000000000000000000000000000000000..70f88402e99939fdbd31afb906c33e65db63fa28 --- /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 38076912e24d76311f5feb66a670b40b0df1f383..3b3a6c92f1d133b9ae757f9a0c3192b9a800ea1c 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