From 2f35983fa1d39dfd8ec558f90bd2cf9a87e339c6 Mon Sep 17 00:00:00 2001
From: lifenow <mojuqianimgm9739@sina.com>
Date: Wed, 11 Nov 2020 14:36:25 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20Upgrading=20dependencies.=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=20mybatis-plus=203.4.1=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=BB=E4=BD=93=E9=85=8D=E7=BD=AE=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=20https://gitee.com/log4j/pig/issues/I24QAB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/config/WebMvcConfiguration.java      |  8 -----
 .../SqlFilterArgumentResolverTest.java        | 36 -------------------
 pig-common/pig-common-mybatis/pom.xml         | 16 +++++++++
 .../mybatis/MybatisAutoConfiguration.java     | 29 +++++++++++----
 .../resolver}/SqlFilterArgumentResolver.java  |  2 +-
 5 files changed, 40 insertions(+), 51 deletions(-)
 delete mode 100644 pig-common/pig-common-core/src/test/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolverTest.java
 rename pig-common/{pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis => pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/resolver}/SqlFilterArgumentResolver.java (98%)

diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java
index 73b0db59..ed3c2491 100644
--- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java
+++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java
@@ -17,16 +17,13 @@
 package com.pig4cloud.pig.common.core.config;
 
 import cn.hutool.core.date.DatePattern;
-import com.pig4cloud.pig.common.core.mybatis.SqlFilterArgumentResolver;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.format.datetime.standard.DateTimeFormatterRegistrar;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 
 import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.SERVLET;
 
@@ -40,11 +37,6 @@ import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebA
 @ConditionalOnWebApplication(type = SERVLET)
 public class WebMvcConfiguration implements WebMvcConfigurer {
 
-	@Override
-	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-		argumentResolvers.add(new SqlFilterArgumentResolver());
-	}
-
 	/**
 	 * 增加GET请求参数中时间类型转换 {@link com.pig4cloud.pig.common.core.jackson.PigJavaTimeModule}
 	 * <ul>
diff --git a/pig-common/pig-common-core/src/test/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolverTest.java b/pig-common/pig-common-core/src/test/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolverTest.java
deleted file mode 100644
index f313bd0f..00000000
--- a/pig-common/pig-common-core/src/test/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolverTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.pig4cloud.pig.common.core.mybatis;
-
-import cn.hutool.core.util.StrUtil;
-import org.junit.Test;
-
-/**
- * @author lengleng
- * @date 2020/10/12
- */
-public class SqlFilterArgumentResolverTest {
-
-    @Test
-    public void supportsParameter() {
-    }
-
-    @Test
-    public void resolveArgument() {
-    	String param = "delete create_time";
-
-		System.out.println(clear(param));
-	}
-
-	private String clear(String param) {
-		if (StrUtil.isBlank(param)) {
-			return StrUtil.trim(param);
-		}
-		StringBuilder builder = new StringBuilder();
-		for (int i = 0; i < param.length(); i++) {
-			char c = param.charAt(i);
-			if (Character.isJavaIdentifierPart(c)) {
-				builder.append(c);
-			}
-		}
-		return builder.toString();
-	}
-}
\ No newline at end of file
diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml
index 1e13fd3b..4f7ae970 100755
--- a/pig-common/pig-common-mybatis/pom.xml
+++ b/pig-common/pig-common-mybatis/pom.xml
@@ -31,6 +31,12 @@
 
 
 	<dependencies>
+		<!--hutool-->
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-core</artifactId>
+			<version>${hutool.version}</version>
+		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
@@ -42,5 +48,15 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
+		<!--server-api-->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java b/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java
index 3c33d65d..d9748fdc 100755
--- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java
+++ b/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java
@@ -16,9 +16,16 @@
 
 package com.pig4cloud.pig.common.mybatis;
 
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.pig4cloud.pig.common.mybatis.resolver.SqlFilterArgumentResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
 
 /**
  * @author lengleng
@@ -27,15 +34,25 @@ import org.springframework.context.annotation.Configuration;
  * mybatis plus 统一配置
  */
 @Configuration(proxyBeanMethods = false)
-public class MybatisAutoConfiguration {
+public class MybatisAutoConfiguration implements WebMvcConfigurer {
 
 	/**
-	 * 分页插件
-	 * @return PaginationInterceptor
+	 * SQL 过滤器避免SQL 注入
+	 * @param argumentResolvers
+	 */
+	@Override
+	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+		argumentResolvers.add(new SqlFilterArgumentResolver());
+	}
+
+	/**
+	 * 分页插件, 对于单一数据库类型来说,都建议配置该值,避免每次分页都去抓取数据库类型
 	 */
 	@Bean
-	public PaginationInterceptor paginationInterceptor() {
-		return new PaginationInterceptor();
+	public MybatisPlusInterceptor mybatisPlusInterceptor() {
+		MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+		interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+		return interceptor;
 	}
 
 }
diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java b/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/resolver/SqlFilterArgumentResolver.java
similarity index 98%
rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java
rename to pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/resolver/SqlFilterArgumentResolver.java
index 35bdb591..1bc37597 100644
--- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java
+++ b/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/resolver/SqlFilterArgumentResolver.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.pig4cloud.pig.common.core.mybatis;
+package com.pig4cloud.pig.common.mybatis.resolver;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;