Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pig-common/pig-common-feign/src/main/java/org/springframework/cloud/openfeign/PigFeignClientsRegistrar.java

pig-auth/src/main/java/com/pig4cloud/pig/auth/support/filter/ValidateCodeFilter.java

@@ -72,7 +72,8 @@ public class ValidateCodeFilter extends OncePerRequestFilter {
 		try {
 			checkCode();
 			filterChain.doFilter(request, response);
-        } catch (ValidateCodeException validateCodeException) {
+		}
+		catch (ValidateCodeException validateCodeException) {
 			throw new OAuth2AuthenticationException(validateCodeException.getMessage());
 		}
 	}

pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/servlet/RepeatBodyRequestWrapper.java

@@ -84,7 +84,8 @@ public class RepeatBodyRequestWrapper extends HttpServletRequestWrapper {
 		byte[] body = new byte[0];
 		try {
 			body = StreamUtils.copyToByteArray(request.getInputStream());
-        } catch (IOException e) {
+		}
+		catch (IOException e) {
 			log.error("解析流中数据异常", e);
 		}
 		return body;
@@ -92,7 +93,6 @@ public class RepeatBodyRequestWrapper extends HttpServletRequestWrapper {
 
 	/**
 	 * 重写 getParameterMap() 方法 解决 undertow 中流被读取后，会进行标记，从而导致无法正确获取 body 中的表单数据的问题
-     *
 	 * @return Map<String, String [ ]> parameterMap
 	 */
 	@Override

pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/RedisUtils.java

@@ -202,7 +202,8 @@ public class RedisUtils {
 		return Optional.ofNullable(redisTemplate).map(template -> {
 			if (time > 0) {
 				template.opsForValue().set(key, value, time, TimeUnit.SECONDS);
-            } else {
+			}
+			else {
 				template.opsForValue().set(key, value);
 			}
 			return true;
@@ -222,7 +223,8 @@ public class RedisUtils {
 		Optional.ofNullable(redisTemplate).map(template -> {
 			if (time > 0) {
 				template.opsForValue().set(key, value, time, timeUnit);
-            } else {
+			}
+			else {
 				template.opsForValue().set(key, value);
 			}
 			return true;

pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/core/PigFeignRequestCloseInterceptor.java

@@ -13,7 +13,6 @@ public class PigFeignRequestCloseInterceptor implements RequestInterceptor {
 
 	/**
 	 * set connection close
-     *
 	 * @param template
 	 */
 	@Override

pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/resolver/SqlFilterArgumentResolver.java

@@ -47,7 +47,6 @@ public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver
 
 	/**
 	 * 判断Controller是否包含page 参数
-     *
 	 * @param parameter 参数
 	 * @return 是否过滤
 	 */

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysLogController.java

@@ -57,7 +57,6 @@ public class SysLogController {
 
 	/**
 	 * 简单分页查询
-     *
 	 * @param page 分页对象
 	 * @param sysLog 系统日志
 	 * @return
@@ -69,7 +68,6 @@ public class SysLogController {
 
 	/**
 	 * 批量删除日志
-     *
 	 * @param ids ID
 	 * @return success/false
 	 */
@@ -81,7 +79,6 @@ public class SysLogController {
 
 	/**
 	 * 插入日志
-     *
 	 * @param sysLog 日志实体
 	 * @return success/false
 	 */
@@ -93,7 +90,6 @@ public class SysLogController {
 
 	/**
 	 * 导出excel 表格
-     *
 	 * @param sysLog 查询条件
 	 * @return
 	 */

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java

@@ -38,7 +38,6 @@ public interface SysLogService extends IService<SysLog> {
 
 	/**
 	 * 分页查询日志
-     *
 	 * @param page
 	 * @param sysLog
 	 * @return
@@ -47,7 +46,6 @@ public interface SysLogService extends IService<SysLog> {
 
 	/**
 	 * 插入日志
-     *
 	 * @param sysLog 日志对象
 	 * @return true/false
 	 */

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java

@@ -87,7 +87,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 保存用户信息
-     *
 	 * @param userDto DTO 对象
 	 * @return success/fail
 	 */
@@ -132,7 +131,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 通过查用户的全部信息
-     *
 	 * @param sysUser 用户
 	 * @return
 	 */
@@ -163,7 +161,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 分页查询用户信息（含有角色信息）
-     *
 	 * @param page 分页对象
 	 * @param userDTO 参数列表
 	 * @return
@@ -175,7 +172,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 通过ID查询用户信息
-     *
 	 * @param id 用户ID
 	 * @return 用户信息
 	 */
@@ -186,7 +182,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 删除用户
-     *
 	 * @param ids 用户ID 列表
 	 * @return Boolean
 	 */
@@ -254,7 +249,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 查询全部的用户
-     *
 	 * @param userDTO 查询条件
 	 * @return list
 	 */
@@ -282,7 +276,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * excel 导入用户, 插入正确的 错误的提示行号
-     *
 	 * @param excelVOList excel 列表数据
 	 * @param bindingResult 错误数据
 	 * @return ok fail
@@ -340,7 +333,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			// 数据合法情况
 			if (CollUtil.isEmpty(errorMsg)) {
 				insertExcelUser(excel, deptOptional, roleCollList, postCollList);
-            } else {
+			}
+			else {
 				// 数据不合法情况
 				errorMessageList.add(new ErrorMessage(excel.getLineNum(), errorMsg));
 			}
@@ -380,7 +374,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 注册用户 赋予用户默认角色
-     *
 	 * @param userDto 用户信息
 	 * @return success/false
 	 */
@@ -398,7 +391,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 锁定用户
-     *
 	 * @param username 用户名
 	 * @return
 	 */

pig-visual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/JavaClassTaskInvok.java

@@ -64,7 +64,8 @@ public class JavaClassTaskInvok implements ITaskInvok {
 		catch (ClassNotFoundException e) {
 			log.error("定时任务java反射类没有找到,执行任务：{}", sysJob.getClassName());
 			throw new TaskException("定时任务java反射类没有找到,执行任务：" + sysJob.getClassName());
-        } catch (IllegalAccessException | InstantiationException e) {
+		}
+		catch (IllegalAccessException | InstantiationException e) {
 			log.error("定时任务java反射类异常,执行任务：{}", sysJob.getClassName());
 			throw new TaskException("定时任务java反射类异常,执行任务：" + sysJob.getClassName());
 		}