diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
index d268b79a4..0a4af583c 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
@@ -42,7 +42,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import redis.clients.jedis.Protocol;
-import redis.clients.util.SafeEncoder;
+import redis.clients.jedis.util.SafeEncoder;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
index d01a11de5..d7b493d12 100644
--- a/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
+++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol;
-import redis.clients.util.SafeEncoder;
+import redis.clients.jedis.util.SafeEncoder;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkBApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
index ee48542e7..951124af6 100644
--- a/mallinkBApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
+++ b/mallinkBApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol;
-import redis.clients.util.SafeEncoder;
+import redis.clients.jedis.util.SafeEncoder;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.Enumeration;
-import java.util.concurrent.TimeUnit;
/**
* 幂等检查
diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
index 5ae2b3db3..ff7e81880 100644
--- a/mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
+++ b/mallinkCApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol;
-import redis.clients.util.SafeEncoder;
+import redis.clients.jedis.util.SafeEncoder;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
diff --git a/mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java
index d01a11de5..d7b493d12 100644
--- a/mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java
+++ b/mallinkCallback/src/main/java/com/iformall/interceptor/RequestInterceptor.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol;
-import redis.clients.util.SafeEncoder;
+import redis.clients.jedis.util.SafeEncoder;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
diff --git a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java
index fbdd5b7d4..8104ee485 100644
--- a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java
+++ b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java
@@ -13,7 +13,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
-import redis.clients.util.Pool;
+import redis.clients.jedis.util.Pool;
import java.util.Date;
diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
index d268b79a4..0a4af583c 100644
--- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
+++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
@@ -42,7 +42,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import redis.clients.jedis.Protocol;
-import redis.clients.util.SafeEncoder;
+import redis.clients.jedis.util.SafeEncoder;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
diff --git a/mallinkSysAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java b/mallinkSysAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
index d01a11de5..d7b493d12 100644
--- a/mallinkSysAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
+++ b/mallinkSysAdmin/src/main/java/com/iformall/interceptor/RequestInterceptor.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import redis.clients.jedis.Protocol;
-import redis.clients.util.SafeEncoder;
+import redis.clients.jedis.util.SafeEncoder;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
diff --git a/mybatis-multi-tenancy/pom.xml b/mybatis-multi-tenancy/pom.xml
index 3066602fb..3f2930697 100644
--- a/mybatis-multi-tenancy/pom.xml
+++ b/mybatis-multi-tenancy/pom.xml
@@ -10,13 +10,13 @@
com.github.jsqlparser
jsqlparser
- 1.4
+ 2.0
compile
org.mybatis
mybatis
- 3.5.2
+ 3.5.4
compile
@@ -30,13 +30,13 @@
test
mysql
mysql-connector-java
- 8.0.17
+ 8.0.19
test
com.alibaba
druid
- 1.1.17
+ 1.1.22
diff --git a/pom.xml b/pom.xml
index ab13e1699..1b457bf0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.1.8.RELEASE
+ 2.2.5.RELEASE
@@ -92,12 +92,30 @@
flowable-spring-boot-starter-process
6.4.0
-
+
+
+ mysql
+ mysql-connector-java
+ 8.0.19
+ runtime
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.2.0
+
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ 2.1.2
+
com.github.pagehelper
pagehelper-spring-boot-starter
- 1.2.10
+ 1.2.13
org.mybatis
@@ -109,31 +127,18 @@
-
-
- com.baomidou
- mybatis-plus-boot-starter
- 3.1.0
-
-
+
- org.mybatis.spring.boot
- mybatis-spring-boot-starter
- 2.1.0
+ com.alibaba
+ druid
+ 1.1.22
-
org.springframework
spring-context-support
-
- mysql
- mysql-connector-java
- 8.0.17
- runtime
-
org.springframework.boot
spring-boot-starter-test
@@ -166,14 +171,8 @@
com.alibaba
fastjson
- 1.2.54
+ 1.2.68
-
- com.alibaba
- druid
- 1.1.17
-
-
org.quartz-scheduler
@@ -225,7 +224,7 @@
org.projectlombok
lombok
- 1.18.2
+ 1.18.10
provided