依赖版本更新

pom.xml

@@ -18,24 +18,18 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<mybatisplus.version>3.3.1</mybatisplus.version>
+		<mybatisplus.version>3.3.2</mybatisplus.version>
 		<mysql.version>8.0.17</mysql.version>
-		<mssql.version>4.0</mssql.version>
-		<oracle.version>11.2.0.3</oracle.version>
 		<druid.version>1.1.22</druid.version>
-		<commons.lang.version>2.6</commons.lang.version>
-		<commons.io.version>2.6</commons.io.version>
-		<commons.codec.version>1.14</commons.codec.version>
-		<commons.configuration.version>1.10</commons.configuration.version>
 		<shiro.version>1.5.3</shiro.version>
 		<jwt.version>0.9.1</jwt.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<qiniu.version>7.2.29</qiniu.version>
 		<aliyun.oss.version>3.9.1</aliyun.oss.version>
-		<qcloud.cos.version>5.6.23</qcloud.cos.version>
+		<qcloud.cos.version>5.6.24</qcloud.cos.version>
 		<swagger.version>2.9.2</swagger.version>
 		<joda.time.version>2.10.6</joda.time.version>
-		<fastjson.version>1.2.68</fastjson.version>
+		<fastjson.version>1.2.70</fastjson.version>
 		<lombok.version>1.18.10</lombok.version>
 		<weixin-java.version>3.8.0</weixin-java.version>
 	</properties>
@@ -103,26 +97,6 @@
 			<artifactId>druid-spring-boot-starter</artifactId>
 			<version>${druid.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>${commons.lang.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${commons.io.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>${commons.codec.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
-			<version>${commons.configuration.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-core</artifactId>

src/main/java/com/github/niefy/common/utils/DateUtils.java

@@ -5,7 +5,7 @@
 
 package com.github.niefy.common.utils;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;

src/main/java/com/github/niefy/common/utils/Query.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.niefy.common.xss.SQLFilter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
 

src/main/java/com/github/niefy/common/validator/Assert.java

@@ -6,7 +6,7 @@
 package com.github.niefy.common.validator;
 
 import com.github.niefy.common.exception.RRException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 数据校验

src/main/java/com/github/niefy/common/xss/SQLFilter.java

@@ -6,7 +6,7 @@
 package com.github.niefy.common.xss;
 
 import com.github.niefy.common.exception.RRException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * SQL过滤

src/main/java/com/github/niefy/common/xss/XssHttpServletRequestWrapper.java

@@ -6,7 +6,7 @@
 package com.github.niefy.common.xss;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 

src/main/java/com/github/niefy/modules/oss/cloud/CloudStorageService.java

@@ -6,7 +6,7 @@
 package com.github.niefy.modules.oss.cloud;
 
 import com.github.niefy.common.utils.DateUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.InputStream;
 import java.util.Date;

src/main/java/com/github/niefy/modules/sys/controller/SysMenuController.java

@@ -12,7 +12,7 @@ import com.github.niefy.common.utils.R;
 import com.github.niefy.modules.sys.entity.SysMenuEntity;
 import com.github.niefy.modules.sys.service.ShiroService;
 import com.github.niefy.modules.sys.service.SysMenuService;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/github/niefy/modules/sys/controller/SysUserController.java

@@ -6,23 +6,23 @@
 package com.github.niefy.modules.sys.controller;
 
 import com.github.niefy.common.annotation.SysLog;
-import com.github.niefy.common.validator.group.AddGroup;
-import com.github.niefy.common.validator.group.UpdateGroup;
-import com.github.niefy.modules.sys.entity.SysUserEntity;
-import com.github.niefy.modules.sys.service.SysUserService;
 import com.github.niefy.common.utils.Constant;
 import com.github.niefy.common.utils.PageUtils;
 import com.github.niefy.common.utils.R;
 import com.github.niefy.common.validator.Assert;
 import com.github.niefy.common.validator.ValidatorUtils;
+import com.github.niefy.common.validator.group.AddGroup;
+import com.github.niefy.common.validator.group.UpdateGroup;
+import com.github.niefy.modules.sys.entity.SysUserEntity;
 import com.github.niefy.modules.sys.form.PasswordForm;
 import com.github.niefy.modules.sys.service.SysUserRoleService;
-import org.apache.commons.lang.ArrayUtils;
+import com.github.niefy.modules.sys.service.SysUserService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -136,11 +136,10 @@ public class SysUserController extends AbstractController {
     @PostMapping("/delete")
     @RequiresPermissions("sys:user:delete")
     public R delete(@RequestBody Long[] userIds) {
-        if (ArrayUtils.contains(userIds, 1L)) {
+        if (Arrays.stream(userIds).filter(id->id.intValue()==Constant.SUPER_ADMIN).findAny().isPresent()) {
             return R.error("系统管理员不能删除");
         }
-
-        if (ArrayUtils.contains(userIds, getUserId())) {
+        if (Arrays.stream(userIds).filter(id->getUserId().equals(id)).findAny().isPresent()) {
             return R.error("当前用户不能删除");
         }
 

src/main/java/com/github/niefy/modules/sys/oauth2/OAuth2Filter.java

@@ -8,7 +8,7 @@ package com.github.niefy.modules.sys.oauth2;
 import com.alibaba.fastjson.JSON;
 import com.github.niefy.common.utils.R;
 import com.github.niefy.common.utils.HttpContextUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;

src/main/java/com/github/niefy/modules/sys/service/impl/ShiroServiceImpl.java

@@ -13,7 +13,7 @@ import com.github.niefy.modules.sys.entity.SysMenuEntity;
 import com.github.niefy.modules.sys.entity.SysUserEntity;
 import com.github.niefy.modules.sys.entity.SysUserTokenEntity;
 import com.github.niefy.modules.sys.service.ShiroService;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/github/niefy/modules/sys/service/impl/SysCaptchaServiceImpl.java

@@ -14,7 +14,7 @@ import com.github.niefy.common.exception.RRException;
 import com.github.niefy.common.utils.DateUtils;
 import com.github.niefy.modules.sys.dao.SysCaptchaDao;
 import com.github.niefy.modules.sys.entity.SysCaptchaEntity;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/github/niefy/modules/sys/service/impl/SysConfigServiceImpl.java

@@ -15,7 +15,7 @@ import com.github.niefy.common.exception.RRException;
 import com.github.niefy.common.utils.PageUtils;
 import com.github.niefy.common.utils.Query;
 import com.github.niefy.modules.sys.dao.SysConfigDao;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/github/niefy/modules/sys/service/impl/SysLogServiceImpl.java

@@ -15,7 +15,7 @@ import com.github.niefy.common.utils.PageUtils;
 import com.github.niefy.common.utils.Query;
 import com.github.niefy.modules.sys.entity.SysLogEntity;
 import com.github.niefy.modules.sys.service.SysLogService;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;

src/main/java/com/github/niefy/modules/sys/service/impl/SysRoleServiceImpl.java

@@ -18,7 +18,7 @@ import com.github.niefy.modules.sys.service.SysRoleService;
 import com.github.niefy.modules.sys.service.SysUserRoleService;
 import com.github.niefy.modules.sys.service.SysUserService;
 import com.github.niefy.common.exception.RRException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/github/niefy/modules/sys/service/impl/SysUserServiceImpl.java

@@ -17,8 +17,8 @@ import com.github.niefy.modules.sys.service.SysUserService;
 import com.github.niefy.common.exception.RRException;
 import com.github.niefy.common.utils.PageUtils;
 import com.github.niefy.common.utils.Query;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/github/niefy/modules/wx/service/impl/WxMsgServiceImpl.java

@@ -1,7 +1,7 @@
 package com.github.niefy.modules.wx.service.impl;
 
 import com.github.niefy.modules.wx.entity.TemplateMsgLog;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;