import 优化

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/NewsDTO.java

@@ -8,10 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDeptDTO.java

@@ -8,12 +8,11 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.utils.TreeNode;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictDataDTO.java

@@ -8,10 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Min;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysDictTypeDTO.java

@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Min;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMenuDTO.java

@@ -8,11 +8,11 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.utils.TreeNode;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.Min;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysParamsDTO.java

@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRegionDTO.java

@@ -8,9 +8,8 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Min;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysRoleDTO.java

@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysUserDTO.java

@@ -8,11 +8,10 @@
 
 package com.epmet.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/LogOperationResultDTO.java

@@ -1,12 +1,7 @@
 package com.epmet.dto.region;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  *
  */

epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/region/Region.java

@@ -9,7 +9,6 @@
 package com.epmet.dto.region;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import lombok.Data;
 
 import java.io.Serializable;

epmet-admin/epmet-admin-client/src/main/java/com/epmet/remote/ParamsRemoteService.java

@@ -9,9 +9,9 @@
 package com.epmet.remote;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.feign.ParamsFeignClient;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.feign.ParamsFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java

@@ -3,7 +3,6 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
-import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.LogOperationListFormDTO;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDeptController.java

@@ -8,14 +8,14 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.SysDeptDTO;
-import com.epmet.service.SysDeptService;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.SysDeptDTO;
+import com.epmet.service.SysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictTypeController.java

@@ -8,18 +8,18 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.SysDictTypeDTO;
-import com.epmet.service.SysDictTypeService;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.SysDictTypeDTO;
 import com.epmet.entity.DictType;
+import com.epmet.service.SysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 import java.util.Map;
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMenuController.java

@@ -8,16 +8,16 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.MenuResourceDTO;
-import com.epmet.dto.SysMenuDTO;
-import com.epmet.service.SysMenuService;
-import com.epmet.service.SysResourceService;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.MenuResourceDTO;
+import com.epmet.dto.SysMenuDTO;
+import com.epmet.service.SysMenuService;
+import com.epmet.service.SysResourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRegionController.java

@@ -8,9 +8,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.SysRegionDTO;
-import com.epmet.dto.region.RegionProvince;
-import com.epmet.service.SysRegionService;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
@@ -19,6 +16,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.SysRegionDTO;
+import com.epmet.dto.region.RegionProvince;
+import com.epmet.service.SysRegionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysRoleController.java

@@ -8,9 +8,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.dto.SysRoleDTO;
-import com.epmet.service.SysRoleService;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -18,8 +15,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.SysRoleDTO;
 import com.epmet.service.SysRoleDataScopeService;
 import com.epmet.service.SysRoleMenuService;
+import com.epmet.service.SysRoleService;
 import com.epmet.service.SysRoleUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysUserController.java

@@ -8,16 +8,11 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.security.user.SecurityUser;
-import com.epmet.dto.PasswordDTO;
-import com.epmet.dto.SysUserDTO;
-import com.epmet.service.SysResourceService;
-import com.epmet.service.SysUserService;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.bo.ResourceBO;
 import com.epmet.commons.tools.security.password.PasswordUtils;
+import com.epmet.commons.tools.security.user.SecurityUser;
 import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -27,9 +22,13 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.PasswordDTO;
+import com.epmet.dto.SysUserDTO;
 import com.epmet.excel.SysUserExcel;
+import com.epmet.service.SysResourceService;
 import com.epmet.service.SysRoleDataScopeService;
 import com.epmet.service.SysRoleUserService;
+import com.epmet.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/CorsConfigEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 跨域配置表
  *

epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java

@@ -18,7 +18,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/RocketMQConsumerRegister.java

@@ -4,19 +4,12 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants;
 import com.epmet.commons.rocketmq.constants.TopicConstants;
 import com.epmet.commons.rocketmq.register.MQAbstractRegister;
 import com.epmet.commons.rocketmq.register.MQConsumerProperties;
-import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.mq.listener.listener.AuthOperationLogListener;
 import com.epmet.mq.listener.listener.PointOperationLogListener;
 import com.epmet.mq.listener.listener.ProjectOperationLogListener;
-import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 @Component
 public class RocketMQConsumerRegister extends MQAbstractRegister {
 
@@ -29,4 +22,4 @@ public class RocketMQConsumerRegister extends MQAbstractRegister {
 
         // ...其他监听器类似
     }
-}
+}

epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java

@@ -2,7 +2,6 @@ package com.epmet.mq.listener.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
-import com.epmet.commons.rocketmq.messages.LoginMQMsg;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/NewsService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.NewsDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.NewsDTO;
 import com.epmet.entity.NewsEntity;
 
 import java.util.Map;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDeptService.java

@@ -8,8 +8,8 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysDeptDTO;
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.SysDeptDTO;
 import com.epmet.entity.SysDeptEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictTypeService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysDictTypeDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysDictTypeDTO;
 import com.epmet.entity.DictType;
 import com.epmet.entity.SysDictTypeEntity;
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogErrorService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysLogErrorDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysLogErrorDTO;
 import com.epmet.entity.SysLogErrorEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogLoginService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysLogLoginDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysLogLoginDTO;
 import com.epmet.entity.SysLogLoginEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysLogOperationService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysLogOperationDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysLogOperationDTO;
 import com.epmet.entity.SysLogOperationEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysMenuService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysMenuDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.security.user.UserDetail;
+import com.epmet.dto.SysMenuDTO;
 import com.epmet.entity.SysMenuEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysParamsService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysParamsDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysParamsDTO;
 import com.epmet.entity.SysParamsEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRegionService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
+import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.SysRegionDTO;
 import com.epmet.dto.region.RegionProvince;
-import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.SysRegionEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysResourceService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.MenuResourceDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.security.bo.ResourceBO;
+import com.epmet.dto.MenuResourceDTO;
 import com.epmet.entity.SysResourceEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysRoleService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysRoleDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysRoleDTO;
 import com.epmet.entity.SysRoleEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysUserService.java

@@ -8,9 +8,9 @@
 
 package com.epmet.service;
 
-import com.epmet.dto.SysUserDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.SysUserDTO;
 import com.epmet.entity.SysUserEntity;
 
 import java.util.List;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/CorsConfigServiceImpl.java

@@ -13,7 +13,6 @@ import com.epmet.service.CorsConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.epmet.auth.constants.AuthOperationEnum;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.feign.ResultDataResolver;

epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/NewsServiceImpl.java

@@ -9,7 +9,6 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.epmet.commons.mybatis.annotation.DataFilter;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;

epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java

@@ -3,7 +3,6 @@ package com.epmet.controller;
 import com.epmet.redis.CustomerAppWxServiceUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Set;
 

epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**

epmet-auth/src/main/java/com/epmet/controller/GovWebController.java

@@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-
 
 /**
  * @author sun

epmet-auth/src/main/java/com/epmet/controller/IcLoinController.java

@@ -29,7 +29,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 @RestController
 @RequestMapping("ic")

epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java

@@ -1,7 +1,6 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -13,11 +12,7 @@ import com.epmet.dto.form.PublicSendSmsCodeFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.service.PublicUserLoginService;
-import com.netflix.ribbon.proxy.annotation.Http;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpRequest;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.*;
 
 /**

epmet-auth/src/main/java/com/epmet/controller/SsoController.java

@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.SsoEnteOrgFormDTO;
 import com.epmet.dto.form.SsoLoginFormDTO;
-import com.epmet.dto.form.SsoWorkLoginFormDTO;
 import com.epmet.dto.form.SsoLoginOperFormDTO;
+import com.epmet.dto.form.SsoWorkLoginFormDTO;
 import com.epmet.dto.result.SsoLoginResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.service.SsoService;

epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java

@@ -1,10 +1,7 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.UserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;

epmet-auth/src/main/java/com/epmet/jwt/JwtTokenUtils.java

@@ -11,14 +11,12 @@ package com.epmet.jwt;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import org.apache.commons.codec.binary.Base64;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -5,7 +5,6 @@ import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;

epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java

@@ -14,8 +14,6 @@ import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.dto.form.GovWebLoginFormDTO;
 import com.epmet.dto.form.GovWebOperLoginFormDTO;
 import com.epmet.dto.result.GovWebOperLoginResultDTO;

epmet-auth/src/main/java/com/epmet/service/impl/IcLoginServiceImpl.java

@@ -29,7 +29,9 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 @Slf4j

epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

@@ -16,7 +16,10 @@ import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.PaUserDTO;
 import com.epmet.dto.PaUserWechatDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.RegisterResultDTO;
+import com.epmet.dto.result.SaveUserResultDTO;
+import com.epmet.dto.result.SendVerificationCodeResultDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;

epmet-auth/src/main/java/com/epmet/service/impl/ResourceServiceImpl.java

@@ -8,7 +8,6 @@
 
 package com.epmet.service.impl;
 
-import io.jsonwebtoken.Claims;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.enums.SuperAdminEnum;
 import com.epmet.commons.tools.exception.ErrorCode;
@@ -23,6 +22,7 @@ import com.epmet.feign.ResourceFeignClient;
 import com.epmet.feign.UserFeignClient;
 import com.epmet.jwt.JwtUtils;
 import com.epmet.service.ResourceService;
+import io.jsonwebtoken.Claims;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

epmet-auth/src/test/java/com/epmet/TokenGenTest.java

@@ -1,12 +1,9 @@
 package com.epmet;
 
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.result.StaffLatestAgencyResultDTO;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.service.impl.GovLoginServiceImpl;

epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm

@@ -17,8 +17,9 @@
 </template>
 
 <script>
-import debounce from 'lodash/debounce'
+    import debounce from 'lodash/debounce'
-export default {
+
+    export default {
   data () {
     return {
       visible: false,

epmet-cloud-generator/src/main/resources/template/index.vue.vm

@@ -43,9 +43,10 @@
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
+    import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './${pathName}-add-or-update'
+    import AddOrUpdate from './'
-export default {
+
+    export default {
   mixins: [mixinViewModule],
   data () {
     return {

epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java

@@ -1,7 +1,6 @@
 package com.epmet.common.token.util;
 
 import com.epmet.common.token.property.TokenPropertise;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

epmet-commons/epmet-commons-dynamic-datasource/src/main/java/com/epmet/commons/dynamic/datasource/util/AbstractDataSourceNameFetcher.java

@@ -1,7 +1,5 @@
 package com.epmet.commons.dynamic.datasource.util;
 
-import com.epmet.commons.dynamic.datasource.enums.DataSourceEnum;
-
 public abstract class AbstractDataSourceNameFetcher {
 
     public abstract String fetchDataSourceName();

epmet-commons/epmet-commons-extapp-auth/src/main/java/com/epmet/commons/extappauth/aspect/ExternalAppRequestAuthAspect.java

@@ -2,9 +2,9 @@ package com.epmet.commons.extappauth.aspect;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
-import com.alibaba.fastjson.JSON;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.extappauth.jwt.JwtTokenUtils;
 import com.epmet.commons.tools.exception.EpmetErrorCode;

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java

@@ -1,8 +1,8 @@
 package com.epmet.commons.mybatis.aspect;
 
 import com.epmet.commons.mybatis.annotation.DataFilter;
+import com.epmet.commons.mybatis.dto.form.GetSQLFilterFormDTO;
 import com.epmet.commons.mybatis.feign.MybatisGovAccessFeignClient;
-import com.epmet.commons.mybatis.dto.form.*;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ThreadLocalConstant;
 import com.epmet.commons.tools.exception.RenException;

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dto/form/StaffPermissionFormDTO.java

@@ -2,9 +2,6 @@ package com.epmet.commons.mybatis.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import java.util.Set;
-
 @Data
 public class StaffPermissionFormDTO {
 

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovAccessFeignClient.java

@@ -1,17 +1,13 @@
 package com.epmet.commons.mybatis.feign;
 
-import com.epmet.commons.mybatis.dto.form.*;
+import com.epmet.commons.mybatis.dto.form.GetSQLFilterFormDTO;
 import com.epmet.commons.mybatis.feign.fallback.MybatisGovAccessFeignClientFallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
-import java.util.Set;
-
 /**
  * @Description
  * @Author sun

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/MybatisGovOrgFeignClient.java

@@ -1,6 +1,6 @@
 package com.epmet.commons.mybatis.feign;
 
-import com.epmet.commons.mybatis.dto.form.*;
+import com.epmet.commons.mybatis.dto.form.DepartmentListResultDTO;
 import com.epmet.commons.mybatis.feign.fallback.MybatisGovOrgFeignClientFallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @Description

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovAccessFeignClientFallback.java

@@ -1,16 +1,11 @@
 package com.epmet.commons.mybatis.feign.fallback;
 
-import com.epmet.commons.mybatis.dto.form.*;
+import com.epmet.commons.mybatis.dto.form.GetSQLFilterFormDTO;
 import com.epmet.commons.mybatis.feign.MybatisGovAccessFeignClient;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 调用政府端权限

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/feign/fallback/MybatisGovOrgFeignClientFallback.java

@@ -1,6 +1,6 @@
 package com.epmet.commons.mybatis.feign.fallback;
 
-import com.epmet.commons.mybatis.dto.form.*;
+import com.epmet.commons.mybatis.dto.form.DepartmentListResultDTO;
 import com.epmet.commons.mybatis.feign.MybatisGovOrgFeignClient;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
@@ -8,7 +8,6 @@ import com.epmet.commons.tools.utils.Result;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 调用政府端权限

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/DataFilterInterceptor.java

@@ -10,7 +10,6 @@ package com.epmet.commons.mybatis.interceptor;
 
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.handlers.AbstractSqlParserHandler;
-import com.epmet.commons.mybatis.aspect.DataFilterAspect;
 import com.epmet.commons.tools.constant.ThreadLocalConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.executor.statement.StatementHandler;

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java

@@ -1,11 +1,8 @@
 package com.epmet.commons.rocketmq.messages;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 组织、网格、人员中间库数据上报MQ

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/register/MQAbstractRegister.java

@@ -4,7 +4,6 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.consumer.listener.MessageListener;
-import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
 
 /**

epmet-commons/epmet-commons-security/src/main/java/com/epmet/commons/security/jwt/JwtUtils.java

@@ -14,7 +14,6 @@ import io.jsonwebtoken.SignatureAlgorithm;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java

@@ -2,7 +2,6 @@ package com.epmet.commons.thirdplat;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.thirdplat.dto.form.jcet.SsoTicketFormDTO;
-import com.epmet.commons.thirdplat.dto.form.jcet.SsoTokenFormDTO;
 import com.epmet.commons.thirdplat.encrypt.SignUtils;
 
 import java.io.UnsupportedEncodingException;

epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/ScanHandler.java

@@ -1,14 +1,13 @@
 package com.epmet.wx.mp.handler;
 
-import java.util.Map;
-
-import org.springframework.stereotype.Component;
-
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
 
 /**
  * @author Binary Wang(https://github.com/binarywang)

epmet-commons/epmet-commons-tools-wx-mp/src/main/java/com/epmet/wx/mp/handler/SubscribeHandler.java

@@ -1,16 +1,15 @@
 package com.epmet.wx.mp.handler;
 
-import java.util.Map;
-
 import com.epmet.wx.mp.builder.TextBuilder;
-import org.springframework.stereotype.Component;
-
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
 
 /**
  * @author Binary Wang(https://github.com/binarywang)

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/MaskResponse.java

@@ -1,10 +1,6 @@
 package com.epmet.commons.tools.annotation;
 
-import com.epmet.commons.tools.enums.RequirePermissionEnum;
-import javassist.runtime.Inner;
-
 import java.lang.annotation.*;
-import java.util.function.Function;
 
 /**
  * 标记一个接口，它的返回值中的某些字段需要打掩码

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java

@@ -1,7 +1,6 @@
 package com.epmet.commons.tools.config;
 
 import com.alibaba.ttl.TtlRunnable;
-import com.alibaba.ttl.threadpool.TtlExecutors;
 import org.slf4j.MDC;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -10,7 +9,10 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * 线程池配置类

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ThreadLocalConstant.java

@@ -1,7 +1,5 @@
 package com.epmet.commons.tools.constant;
 
-import java.util.Map;
-
 /**
  * ThreadLocal常亮
  */

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java

@@ -9,12 +9,12 @@
 package com.epmet.commons.tools.security.config;
 
 import com.epmet.commons.tools.security.resolver.LoginUserHandlerMethodArgumentResolver;
+import com.epmet.commons.tools.security.resolver.UserDetailHandlerMethodArgumentResolver;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.epmet.commons.tools.security.resolver.UserDetailHandlerMethodArgumentResolver;
-import com.epmet.commons.tools.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCrypt.java

@@ -1,8 +1,6 @@
 package com.epmet.commons.tools.security.password;
 
 import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/resolver/LoginUserHandlerMethodArgumentResolver.java

@@ -27,17 +27,12 @@ import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
-import org.springframework.web.servlet.HandlerMapping;
 
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 
 /**
  * 有@LoginUser注解的方法参数，注入当前登录用户

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java

@@ -1,7 +1,6 @@
 package com.epmet.commons.tools.utils;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
-import com.epmet.commons.tools.constant.StrConstant;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java

@@ -2,13 +2,10 @@ package com.epmet.commons.tools.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.commons.tools.exception.RenException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.CharEncoding;
 import org.springframework.util.Base64Utils;
 import org.springframework.util.StringUtils;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/TreeStringNode.java

@@ -8,7 +8,6 @@
 
 package com.epmet.commons.tools.utils;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;

epmet-gateway/src/main/java/com/epmet/auth/AuthProcessor.java

@@ -1,15 +1,7 @@
 package com.epmet.auth;
 
-import com.alibaba.fastjson.JSON;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.nio.charset.StandardCharsets;
 
 public abstract class AuthProcessor {
 

epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java

@@ -9,18 +9,16 @@
 package com.epmet.filter;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.feign.ResourceFeignClient;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.security.user.UserDetail;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.ResourceFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java

@@ -9,7 +9,8 @@ import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * app接口权限过滤器

epmet-gateway/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -1,7 +1,6 @@
 package com.epmet.healthcheck;
 
 import com.epmet.commons.tools.utils.Result;
-import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

epmet-gateway/src/main/java/com/epmet/jwt/JwtTokenUtils.java

@@ -11,14 +11,12 @@ package com.epmet.jwt;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import org.apache.commons.codec.binary.Base64;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/AgenctBasicDataFormDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.dto.datastats.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.dataaggre.dto.resigroup.form.CandidateListFormDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java

@@ -1,8 +1,9 @@
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -17,7 +18,7 @@ public class AcUserAuthorizeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -82,4 +83,4 @@ public class AcUserAuthorizeDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class AcUserDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -118,4 +119,4 @@ public class AcUserDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrProjectTemplateCategoryDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -82,4 +83,4 @@ public class PrProjectTemplateCategoryDTO implements Serializable {
      * 更新时间
      */
     private Date updatedTime;
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrProjectTemplateDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -108,4 +109,4 @@ public class PrProjectTemplateDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrProjectTemplateItemDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -54,7 +55,7 @@ public class PrProjectTemplateItemDTO implements Serializable {
 	private String formItemId;
 
     /**
-     * 表单项类型 
+     * 表单项类型
      */
 	private String type;
 
@@ -99,7 +100,7 @@ public class PrProjectTemplateItemDTO implements Serializable {
 	private String expand;
 
     /**
-     * 正则表达式 
+     * 正则表达式
      */
 	private String regList;
 
@@ -138,4 +139,4 @@ public class PrProjectTemplateItemDTO implements Serializable {
      */
 	private Integer isDisplayType;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrProjectThemeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -98,4 +99,4 @@ public class PrProjectThemeDTO implements Serializable {
      * 更新时间
      */
     private Date updatedTime;
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrPublishRangeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -93,4 +94,4 @@ public class PrPublishRangeDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrResultExtDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -98,4 +99,4 @@ public class PrResultExtDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -118,4 +119,4 @@ public class PrUserProjectDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectItemDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -54,7 +55,7 @@ public class PrUserProjectItemDTO implements Serializable {
 	private String formItemId;
 
     /**
-     * 表单项类型 
+     * 表单项类型
      */
 	private String type;
 
@@ -104,7 +105,7 @@ public class PrUserProjectItemDTO implements Serializable {
 	private String expand;
 
     /**
-     * 正则表达式 
+     * 正则表达式
      */
 	private String regList;
 
@@ -138,4 +139,4 @@ public class PrUserProjectItemDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -54,7 +55,7 @@ public class PrUserProjectLogicDTO implements Serializable {
 	private String formItemId;
 
     /**
-     * 条件选项 
+     * 条件选项
      */
 	private Integer expression;
 
@@ -93,4 +94,4 @@ public class PrUserProjectLogicDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectResultDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -138,4 +139,4 @@ public class PrUserProjectResultDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectSettingDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -74,7 +75,7 @@ public class PrUserProjectSettingDTO implements Serializable {
 	private Integer isWxWrite;
 
     /**
-     * 
+     *
      */
 	private Integer isWxWriteOnce;
 
@@ -183,4 +184,4 @@ public class PrUserProjectSettingDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dataaggre.dto.epmettduck;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -34,7 +35,7 @@ public class PrUserProjectThemeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
 	private String id;
 
@@ -123,4 +124,4 @@ public class PrUserProjectThemeDTO implements Serializable {
      */
     private Date updatedTime;
 
-}
+}