🚚 将 RepeatBodyRequestWrapper 和 ModifyParameterRequestWrapper 迁移到 web …

…模块下，以剔除 ballcat-common-core 对于 servlet-api 的依赖
ballcat-projects · Feb 29, 2024 · adc3ba7 · adc3ba7
1 parent 071410f
commit adc3ba7
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/common/ballcat-common-core/pom.xml b/common/ballcat-common-core/pom.xml
@@ -51,11 +51,6 @@
 			<artifactId>hibernate-validator</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>org.glassfish</groupId>

diff --git a/...cat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java b/...cat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java
@@ -27,12 +27,12 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.ballcat.common.core.request.wrapper.ModifyParameterRequestWrapper;
 import org.ballcat.common.model.result.R;
 import org.ballcat.common.model.result.SystemResultCode;
 import org.ballcat.common.util.JsonUtils;
 import org.ballcat.springsecurity.oauth2.ScopeNames;
 import org.ballcat.springsecurity.util.PasswordUtils;
+import org.ballcat.web.util.ModifyParameterRequestWrapper;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.Authentication;

diff --git a/security/ballcat-spring-security/pom.xml b/security/ballcat-spring-security/pom.xml
@@ -46,6 +46,10 @@
 			<groupId>org.ballcat</groupId>
 			<artifactId>ballcat-common-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.ballcat</groupId>
+			<artifactId>ballcat-web</artifactId>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/...urity/src/main/java/org/ballcat/springsecurity/web/filter/LoginPasswordDecoderFilter.java b/...urity/src/main/java/org/ballcat/springsecurity/web/filter/LoginPasswordDecoderFilter.java
@@ -26,8 +26,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import lombok.extern.slf4j.Slf4j;
-import org.ballcat.common.core.request.wrapper.ModifyParameterRequestWrapper;
 import org.ballcat.springsecurity.util.PasswordUtils;
+import org.ballcat.web.util.ModifyParameterRequestWrapper;
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceAware;
 import org.springframework.context.support.MessageSourceAccessor;

diff --git a/web/ballcat-web/src/main/java/org/ballcat/web/accesslog/AbstractAccessLogFilter.java b/web/ballcat-web/src/main/java/org/ballcat/web/accesslog/AbstractAccessLogFilter.java
@@ -28,7 +28,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.ballcat.common.core.constant.MDCConstants;
-import org.ballcat.common.core.request.wrapper.RepeatBodyRequestWrapper;
+import org.ballcat.web.util.RepeatBodyRequestWrapper;
 import org.slf4j.MDC;
 import org.springframework.core.Ordered;
 import org.springframework.lang.Nullable;

diff --git a/...rapper/ModifyParameterRequestWrapper.java → ...b/util/ModifyParameterRequestWrapper.java b/...rapper/ModifyParameterRequestWrapper.java → ...b/util/ModifyParameterRequestWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.ballcat.common.core.request.wrapper;
+package org.ballcat.web.util;
 
 import java.util.Collections;
 import java.util.Enumeration;

diff --git a/...est/wrapper/RepeatBodyRequestWrapper.java → ...at/web/util/RepeatBodyRequestWrapper.java b/...est/wrapper/RepeatBodyRequestWrapper.java → ...at/web/util/RepeatBodyRequestWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.ballcat.common.core.request.wrapper;
+package org.ballcat.web.util;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;