| @@ -42,7 +42,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; | |||||
| import org.springframework.stereotype.Controller; | import org.springframework.stereotype.Controller; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import redis.clients.jedis.Protocol; | 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.Cookie; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; | |||||
| import org.springframework.web.servlet.ModelAndView; | import org.springframework.web.servlet.ModelAndView; | ||||
| import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | ||||
| import redis.clients.jedis.Protocol; | import redis.clients.jedis.Protocol; | ||||
| import redis.clients.util.SafeEncoder; | |||||
| import redis.clients.jedis.util.SafeEncoder; | |||||
| import javax.annotation.Resource; | import javax.annotation.Resource; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; | |||||
| import org.springframework.web.servlet.ModelAndView; | import org.springframework.web.servlet.ModelAndView; | ||||
| import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | ||||
| import redis.clients.jedis.Protocol; | import redis.clients.jedis.Protocol; | ||||
| import redis.clients.util.SafeEncoder; | |||||
| import redis.clients.jedis.util.SafeEncoder; | |||||
| import javax.annotation.Resource; | import javax.annotation.Resource; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| @@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream; | |||||
| import java.io.InputStream; | import java.io.InputStream; | ||||
| import java.nio.charset.Charset; | import java.nio.charset.Charset; | ||||
| import java.util.Enumeration; | import java.util.Enumeration; | ||||
| import java.util.concurrent.TimeUnit; | |||||
| /** | /** | ||||
| * 幂等检查 | * 幂等检查 | ||||
| @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; | |||||
| import org.springframework.web.servlet.ModelAndView; | import org.springframework.web.servlet.ModelAndView; | ||||
| import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | ||||
| import redis.clients.jedis.Protocol; | import redis.clients.jedis.Protocol; | ||||
| import redis.clients.util.SafeEncoder; | |||||
| import redis.clients.jedis.util.SafeEncoder; | |||||
| import javax.annotation.Resource; | import javax.annotation.Resource; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; | |||||
| import org.springframework.web.servlet.ModelAndView; | import org.springframework.web.servlet.ModelAndView; | ||||
| import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | ||||
| import redis.clients.jedis.Protocol; | import redis.clients.jedis.Protocol; | ||||
| import redis.clients.util.SafeEncoder; | |||||
| import redis.clients.jedis.util.SafeEncoder; | |||||
| import javax.annotation.Resource; | import javax.annotation.Resource; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| @@ -13,7 +13,7 @@ import org.slf4j.Logger; | |||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import redis.clients.jedis.Jedis; | import redis.clients.jedis.Jedis; | ||||
| import redis.clients.jedis.JedisPool; | import redis.clients.jedis.JedisPool; | ||||
| import redis.clients.util.Pool; | |||||
| import redis.clients.jedis.util.Pool; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| @@ -42,7 +42,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; | |||||
| import org.springframework.stereotype.Controller; | import org.springframework.stereotype.Controller; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import redis.clients.jedis.Protocol; | 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.Cookie; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; | |||||
| import org.springframework.web.servlet.ModelAndView; | import org.springframework.web.servlet.ModelAndView; | ||||
| import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | ||||
| import redis.clients.jedis.Protocol; | import redis.clients.jedis.Protocol; | ||||
| import redis.clients.util.SafeEncoder; | |||||
| import redis.clients.jedis.util.SafeEncoder; | |||||
| import javax.annotation.Resource; | import javax.annotation.Resource; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| @@ -10,13 +10,13 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>com.github.jsqlparser</groupId> | <groupId>com.github.jsqlparser</groupId> | ||||
| <artifactId>jsqlparser</artifactId> | <artifactId>jsqlparser</artifactId> | ||||
| <version>1.4</version> | |||||
| <version>2.0</version> | |||||
| <scope>compile</scope> | <scope>compile</scope> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>org.mybatis</groupId> | <groupId>org.mybatis</groupId> | ||||
| <artifactId>mybatis</artifactId> | <artifactId>mybatis</artifactId> | ||||
| <version>3.5.2</version> | |||||
| <version>3.5.4</version> | |||||
| <scope>compile</scope> | <scope>compile</scope> | ||||
| </dependency> | </dependency> | ||||
| <!--测试期间依赖--> | <!--测试期间依赖--> | ||||
| @@ -30,13 +30,13 @@ | |||||
| <scope>test</scope> | <scope>test</scope> | ||||
| <groupId>mysql</groupId> | <groupId>mysql</groupId> | ||||
| <artifactId>mysql-connector-java</artifactId> | <artifactId>mysql-connector-java</artifactId> | ||||
| <version>8.0.17</version> | |||||
| <version>8.0.19</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <scope>test</scope> | <scope>test</scope> | ||||
| <groupId>com.alibaba</groupId> | <groupId>com.alibaba</groupId> | ||||
| <artifactId>druid</artifactId> | <artifactId>druid</artifactId> | ||||
| <version>1.1.17</version> | |||||
| <version>1.1.22</version> | |||||
| </dependency> | </dependency> | ||||
| </dependencies> | </dependencies> | ||||
| <build> | <build> | ||||
| @@ -27,7 +27,7 @@ | |||||
| <parent> | <parent> | ||||
| <groupId>org.springframework.boot</groupId> | <groupId>org.springframework.boot</groupId> | ||||
| <artifactId>spring-boot-starter-parent</artifactId> | <artifactId>spring-boot-starter-parent</artifactId> | ||||
| <version>2.1.8.RELEASE</version> | |||||
| <version>2.2.5.RELEASE</version> | |||||
| <relativePath/> | <relativePath/> | ||||
| </parent> | </parent> | ||||
| @@ -92,12 +92,30 @@ | |||||
| <artifactId>flowable-spring-boot-starter-process</artifactId> | <artifactId>flowable-spring-boot-starter-process</artifactId> | ||||
| <version>6.4.0</version> | <version>6.4.0</version> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>mysql</groupId> | |||||
| <artifactId>mysql-connector-java</artifactId> | |||||
| <version>8.0.19</version> | |||||
| <scope>runtime</scope> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>com.baomidou</groupId> | |||||
| <artifactId>mybatis-plus-boot-starter</artifactId> | |||||
| <version>3.2.0</version> | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>org.mybatis.spring.boot</groupId> | |||||
| <artifactId>mybatis-spring-boot-starter</artifactId> | |||||
| <version>2.1.2</version> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>com.github.pagehelper</groupId> | <groupId>com.github.pagehelper</groupId> | ||||
| <artifactId>pagehelper-spring-boot-starter</artifactId> | <artifactId>pagehelper-spring-boot-starter</artifactId> | ||||
| <version>1.2.10</version> | |||||
| <version>1.2.13</version> | |||||
| <exclusions> | <exclusions> | ||||
| <exclusion> | <exclusion> | ||||
| <groupId>org.mybatis</groupId> | <groupId>org.mybatis</groupId> | ||||
| @@ -109,31 +127,18 @@ | |||||
| </exclusion> | </exclusion> | ||||
| </exclusions> | </exclusions> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>com.baomidou</groupId> | |||||
| <artifactId>mybatis-plus-boot-starter</artifactId> | |||||
| <version>3.1.0</version> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.mybatis.spring.boot</groupId> | |||||
| <artifactId>mybatis-spring-boot-starter</artifactId> | |||||
| <version>2.1.0</version> | |||||
| <groupId>com.alibaba</groupId> | |||||
| <artifactId>druid</artifactId> | |||||
| <version>1.1.22</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <groupId>org.springframework</groupId> | <groupId>org.springframework</groupId> | ||||
| <artifactId>spring-context-support</artifactId> | <artifactId>spring-context-support</artifactId> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>mysql</groupId> | |||||
| <artifactId>mysql-connector-java</artifactId> | |||||
| <version>8.0.17</version> | |||||
| <scope>runtime</scope> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.springframework.boot</groupId> | <groupId>org.springframework.boot</groupId> | ||||
| <artifactId>spring-boot-starter-test</artifactId> | <artifactId>spring-boot-starter-test</artifactId> | ||||
| @@ -166,14 +171,8 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>com.alibaba</groupId> | <groupId>com.alibaba</groupId> | ||||
| <artifactId>fastjson</artifactId> | <artifactId>fastjson</artifactId> | ||||
| <version>1.2.54</version> | |||||
| <version>1.2.68</version> | |||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>com.alibaba</groupId> | |||||
| <artifactId>druid</artifactId> | |||||
| <version>1.1.17</version> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.quartz-scheduler</groupId> | <groupId>org.quartz-scheduler</groupId> | ||||
| @@ -225,7 +224,7 @@ | |||||
| <dependency> | <dependency> | ||||
| <groupId>org.projectlombok</groupId> | <groupId>org.projectlombok</groupId> | ||||
| <artifactId>lombok</artifactId> | <artifactId>lombok</artifactId> | ||||
| <version>1.18.2</version> | |||||
| <version>1.18.10</version> | |||||
| <scope>provided</scope> | <scope>provided</scope> | ||||
| </dependency> | </dependency> | ||||
| <!-- </dependencyManagement> --> | <!-- </dependencyManagement> --> | ||||