🎨 Improving structure / format of the code. 优化代码，批量删除无用 import

2023-04-07 14:39:09 +08:00
1 parent 6f2187ed0a
commit fbde71ccc4
@@ -20,7 +20,6 @@ package com.pig4cloud.pigx.app.controller;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pig4cloud.pigx.app.api.entity.AppMenu;
-import com.pig4cloud.pigx.app.api.entity.AppRole;
 import com.pig4cloud.pigx.app.service.AppMenuService;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
@@ -20,9 +20,7 @@ package com.pig4cloud.pigx.app.controller;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.pig4cloud.pigx.admin.api.vo.RoleExcelVO;
 import com.pig4cloud.pigx.app.api.entity.AppRole;
-import com.pig4cloud.pigx.app.api.entity.AppUser;
 import com.pig4cloud.pigx.app.api.vo.AppRoleExcelVO;
 import com.pig4cloud.pigx.app.api.vo.AppRoleVO;
 import com.pig4cloud.pigx.app.service.AppRoleService;
@@ -19,7 +19,6 @@ package com.pig4cloud.pigx.app.controller;

 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.pig4cloud.pigx.admin.api.vo.UserExcelVO;
 import com.pig4cloud.pigx.app.api.dto.AppUserDTO;
 import com.pig4cloud.pigx.app.api.entity.AppUser;
 import com.pig4cloud.pigx.app.api.vo.AppUserExcelVO;
@@ -25,11 +25,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.app.api.entity.AppMenu;
 import com.pig4cloud.pigx.app.api.entity.AppRoleMenu;
-import com.pig4cloud.pigx.app.api.entity.AppUserRole;
 import com.pig4cloud.pigx.app.mapper.AppMenuMapper;
 import com.pig4cloud.pigx.app.mapper.AppRoleMenuMapper;
 import com.pig4cloud.pigx.app.service.AppMenuService;
-import com.pig4cloud.pigx.app.service.AppRoleMenuService;
 import com.pig4cloud.pigx.common.core.constant.CacheConstants;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import com.pig4cloud.pigx.common.core.constant.enums.MenuTypeEnum;
@@ -43,7 +41,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import javax.validation.constraints.NotNull;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -19,8 +19,6 @@ package com.pig4cloud.pigx.app.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pig4cloud.pigx.admin.api.entity.SysRole;
-import com.pig4cloud.pigx.admin.api.vo.RoleExcelVO;
 import com.pig4cloud.pigx.app.api.entity.AppRole;
 import com.pig4cloud.pigx.app.api.entity.AppRoleMenu;
 import com.pig4cloud.pigx.app.api.vo.AppRoleExcelVO;
@@ -37,7 +35,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.BindingResult;

 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;

@@ -23,12 +23,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pig4cloud.pigx.admin.api.dto.UserDTO;
-import com.pig4cloud.pigx.admin.api.entity.SysDept;
-import com.pig4cloud.pigx.admin.api.entity.SysPost;
-import com.pig4cloud.pigx.admin.api.entity.SysRole;
-import com.pig4cloud.pigx.admin.api.entity.SysUser;
-import com.pig4cloud.pigx.admin.api.vo.UserExcelVO;
 import com.pig4cloud.pigx.app.api.dto.AppUserDTO;
 import com.pig4cloud.pigx.app.api.dto.AppUserInfo;
 import com.pig4cloud.pigx.app.api.entity.AppMenu;
@@ -59,7 +53,9 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.BindingResult;

-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;

 /**
@@ -2,7 +2,6 @@ package com.pig4cloud.pigx.auth.support.password;

 import com.pig4cloud.pigx.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationConverter;
 import com.pig4cloud.pigx.common.security.util.OAuth2EndpointUtils;
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
@@ -10,6 +9,7 @@ import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;

+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 import java.util.Set;

@@ -1,11 +1,10 @@
 package com.pig4cloud.pigx.common.audit;

 import com.pig4cloud.pigx.admin.api.feign.RemoteAuditLogService;
-import com.pig4cloud.pigx.admin.api.feign.RemoteLogService;
 import com.pig4cloud.pigx.common.audit.aop.AuditAspect;
 import com.pig4cloud.pigx.common.audit.handle.DefaultAuditLogHandle;
-import com.pig4cloud.pigx.common.audit.handle.ICompareHandle;
 import com.pig4cloud.pigx.common.audit.handle.IAuditLogHandle;
+import com.pig4cloud.pigx.common.audit.handle.ICompareHandle;
 import com.pig4cloud.pigx.common.audit.handle.JavesCompareHandle;
 import com.pig4cloud.pigx.common.audit.support.SpelParser;
 import com.pig4cloud.pigx.common.core.util.KeyStrResolver;
@@ -20,7 +20,6 @@ package com.pig4cloud.pigx.common.data.datascope;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.admin.api.entity.SysDept;
-import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation;
 import com.pig4cloud.pigx.admin.api.entity.SysRole;
 import com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService;
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
@@ -23,7 +23,10 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import com.pig4cloud.pigx.admin.api.feign.RemoteDataScopeService;
 import com.pig4cloud.pigx.common.data.config.PigxMybatisProperties;
-import com.pig4cloud.pigx.common.data.datascope.*;
+import com.pig4cloud.pigx.common.data.datascope.DataScopeInnerInterceptor;
+import com.pig4cloud.pigx.common.data.datascope.DataScopeInterceptor;
+import com.pig4cloud.pigx.common.data.datascope.DataScopeSqlInjector;
+import com.pig4cloud.pigx.common.data.datascope.PigxDefaultDatascopeHandle;
 import com.pig4cloud.pigx.common.data.resolver.SqlFilterArgumentResolver;
 import com.pig4cloud.pigx.common.data.tenant.PigxTenantConfigProperties;
 import com.pig4cloud.pigx.common.data.tenant.PigxTenantHandler;
@@ -1,7 +1,7 @@
 package com.pig4cloud.pigx.common.api.encrypt.annotation.crypto;

-import com.pig4cloud.pigx.common.api.encrypt.annotation.encrypt.ApiEncrypt;
 import com.pig4cloud.pigx.common.api.encrypt.annotation.decrypt.ApiDecrypt;
+import com.pig4cloud.pigx.common.api.encrypt.annotation.encrypt.ApiEncrypt;
 import com.pig4cloud.pigx.common.api.encrypt.enums.EncryptType;

 import java.lang.annotation.*;
@@ -1,7 +1,7 @@
 package com.pig4cloud.pigx.common.api.encrypt.annotation.crypto;

-import com.pig4cloud.pigx.common.api.encrypt.annotation.encrypt.ApiEncrypt;
 import com.pig4cloud.pigx.common.api.encrypt.annotation.decrypt.ApiDecrypt;
+import com.pig4cloud.pigx.common.api.encrypt.annotation.encrypt.ApiEncrypt;
 import com.pig4cloud.pigx.common.api.encrypt.enums.EncryptType;

 import java.lang.annotation.*;
@@ -1,7 +1,7 @@
 package com.pig4cloud.pigx.common.api.encrypt.annotation.crypto;

-import com.pig4cloud.pigx.common.api.encrypt.annotation.encrypt.ApiEncrypt;
 import com.pig4cloud.pigx.common.api.encrypt.annotation.decrypt.ApiDecrypt;
+import com.pig4cloud.pigx.common.api.encrypt.annotation.encrypt.ApiEncrypt;
 import com.pig4cloud.pigx.common.api.encrypt.enums.EncryptType;

 import java.lang.annotation.*;
@@ -1,8 +1,8 @@
 package com.pig4cloud.pigx.common.api.encrypt.bean;

+import com.pig4cloud.pigx.common.api.encrypt.enums.EncryptType;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import com.pig4cloud.pigx.common.api.encrypt.enums.EncryptType;

 /**
 * <p>
@@ -1,11 +1,11 @@
 package com.pig4cloud.pigx.common.excel;

-import com.pig4cloud.pigx.common.excel.config.ExcelConfigProperties;
-import com.pig4cloud.pigx.common.excel.processor.NameProcessor;
-import com.pig4cloud.pigx.common.excel.processor.NameSpelExpressionProcessor;
 import com.pig4cloud.pigx.common.excel.aop.DynamicNameAspect;
 import com.pig4cloud.pigx.common.excel.aop.RequestExcelArgumentResolver;
 import com.pig4cloud.pigx.common.excel.aop.ResponseExcelReturnValueHandler;
+import com.pig4cloud.pigx.common.excel.config.ExcelConfigProperties;
+import com.pig4cloud.pigx.common.excel.processor.NameProcessor;
+import com.pig4cloud.pigx.common.excel.processor.NameSpelExpressionProcessor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -1,7 +1,7 @@
 package com.pig4cloud.pigx.common.excel.aop;

-import com.pig4cloud.pigx.common.excel.processor.NameProcessor;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
+import com.pig4cloud.pigx.common.excel.processor.NameProcessor;
 import lombok.RequiredArgsConstructor;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -1,7 +1,7 @@
 package com.pig4cloud.pigx.common.excel.aop;

-import com.pig4cloud.pigx.common.excel.handler.SheetWriteHandler;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
+import com.pig4cloud.pigx.common.excel.handler.SheetWriteHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
@@ -8,7 +8,6 @@ import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;

 import java.text.ParseException;
-import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;

@@ -2,8 +2,8 @@ package com.pig4cloud.pigx.common.excel.enhance;

 import com.alibaba.excel.write.builder.ExcelWriterBuilder;
 import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
-import com.pig4cloud.pigx.common.excel.head.HeadGenerator;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
+import com.pig4cloud.pigx.common.excel.head.HeadGenerator;

 import javax.servlet.http.HttpServletResponse;

@@ -4,11 +4,11 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
+import com.pig4cloud.pigx.common.excel.annotation.Sheet;
 import com.pig4cloud.pigx.common.excel.config.ExcelConfigProperties;
 import com.pig4cloud.pigx.common.excel.enhance.WriterBuilderEnhancer;
 import com.pig4cloud.pigx.common.excel.kit.ExcelException;
-import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
-import com.pig4cloud.pigx.common.excel.annotation.Sheet;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.util.CollectionUtils;

@@ -4,10 +4,10 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import com.pig4cloud.pigx.common.excel.config.ExcelConfigProperties;
 import com.pig4cloud.pigx.common.excel.enhance.WriterBuilderEnhancer;
 import com.pig4cloud.pigx.common.excel.kit.ExcelException;
-import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.util.CollectionUtils;

@@ -18,6 +18,7 @@
 package com.pig4cloud.pigx.common.feign.annotation;

 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.cloud.openfeign.PigxFeignClientsRegistrar;
 import org.springframework.context.annotation.Import;

@@ -13,6 +13,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.handler.ResponseStatusExceptionHandler;
 import reactor.core.publisher.Mono;

 /**
@@ -20,20 +20,15 @@ package com.pig4cloud.pigx.admin.controller;
 import com.pig4cloud.pigx.admin.service.MobileService;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.security.annotation.Inner;
-
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import me.chanjar.weixin.cp.bean.external.WxCpUserExternalGroupChatStatistic;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

-import java.util.ArrayList;
-import java.util.List;
-
 /**
 * @author lengleng
 * @date 2018/11/14
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails;
 import com.pig4cloud.pigx.admin.service.SysSocialDetailsService;
-import com.pig4cloud.pigx.app.api.entity.AppSocialDetails;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.core.util.ValidGroup;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
@@ -26,7 +26,10 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;

 import java.util.Map;

@@ -17,8 +17,8 @@

 package com.pig4cloud.pigx.admin.mapper;

-import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
 import com.pig4cloud.pigx.admin.api.entity.SysAuditLog;
+import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
 import org.apache.ibatis.annotations.Mapper;

 /**
@@ -2,7 +2,6 @@ package com.pig4cloud.pigx.admin.service;

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pig4cloud.pigx.admin.api.entity.SysI18nEntity;
-import com.pig4cloud.pigx.admin.api.entity.SysLog;
 import com.pig4cloud.pigx.common.core.util.R;

 import java.util.Map;
@@ -37,7 +37,6 @@ import org.springframework.web.multipart.MultipartFile;

 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -22,9 +22,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.codegen.entity.GenGroupEntity;
-import com.pig4cloud.pigx.codegen.util.vo.TemplateGroupDTO;
-import com.pig4cloud.pigx.codegen.util.vo.GroupVo;
 import com.pig4cloud.pigx.codegen.service.GenGroupService;
+import com.pig4cloud.pigx.codegen.util.vo.GroupVo;
+import com.pig4cloud.pigx.codegen.util.vo.TemplateGroupDTO;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
@@ -17,23 +17,23 @@

 package com.pig4cloud.pigx.codegen.controller;

-import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.codegen.entity.GenTemplateEntity;
 import com.pig4cloud.pigx.codegen.service.GenTemplateService;
-import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import org.springframework.http.HttpHeaders;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.pig4cloud.pigx.common.log.annotation.SysLog;
+import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@@ -21,17 +21,17 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.codegen.entity.GenTemplateGroupEntity;
 import com.pig4cloud.pigx.codegen.service.GenTemplateGroupService;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import org.springframework.http.HttpHeaders;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@@ -17,15 +17,13 @@

 package com.pig4cloud.pigx.codegen.entity;

-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

-import java.io.Serializable;
-
 /**
 * 模板分组关联表
 *
@@ -17,9 +17,9 @@

 package com.pig4cloud.pigx.codegen.mapper;

+import com.pig4cloud.pigx.codegen.entity.GenGroupEntity;
 import com.pig4cloud.pigx.codegen.util.vo.GroupVo;
 import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
-import com.pig4cloud.pigx.codegen.entity.GenGroupEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

@@ -18,7 +18,6 @@
 package com.pig4cloud.pigx.codegen.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
 import com.pig4cloud.pigx.codegen.entity.GenTemplateGroupEntity;
 import org.apache.ibatis.annotations.Mapper;

@@ -17,8 +17,8 @@

 package com.pig4cloud.pigx.codegen.mapper;

-import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
 import com.pig4cloud.pigx.codegen.entity.GenTemplateEntity;
+import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
 import org.apache.ibatis.annotations.Mapper;

 import java.util.List;
@@ -19,8 +19,8 @@ package com.pig4cloud.pigx.codegen.service;

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pig4cloud.pigx.codegen.entity.GenGroupEntity;
-import com.pig4cloud.pigx.codegen.util.vo.TemplateGroupDTO;
 import com.pig4cloud.pigx.codegen.util.vo.GroupVo;
+import com.pig4cloud.pigx.codegen.util.vo.TemplateGroupDTO;

 /**
 * 模板分组
@@ -32,8 +32,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.codegen.entity.GenGroupEntity;
 import com.pig4cloud.pigx.codegen.entity.GenTable;
 import com.pig4cloud.pigx.codegen.entity.GenTableColumnEntity;
-import com.pig4cloud.pigx.codegen.mapper.GeneratorMapper;
 import com.pig4cloud.pigx.codegen.mapper.GenTableMapper;
+import com.pig4cloud.pigx.codegen.mapper.GeneratorMapper;
 import com.pig4cloud.pigx.codegen.service.GenGroupService;
 import com.pig4cloud.pigx.codegen.service.GenTableColumnService;
 import com.pig4cloud.pigx.codegen.service.GenTableService;
@@ -17,8 +17,6 @@

 package com.pig4cloud.pigx.daemon.quartz.config;

-import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
-import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
 import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
 import com.pig4cloud.pigx.daemon.quartz.util.TaskUtil;
@@ -17,8 +17,6 @@

 package com.pig4cloud.pigx.daemon.quartz.config;

-import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
-import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import lombok.SneakyThrows;
@@ -17,8 +17,6 @@

 package com.pig4cloud.pigx.daemon.quartz.config;

-import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
-import com.pig4cloud.pigx.daemon.quartz.event.SysJobEvent;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.event.SysJobEvent;
 import lombok.AllArgsConstructor;
@@ -19,7 +19,6 @@ package com.pig4cloud.pigx.daemon.quartz.controller;

 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,8 +27,6 @@ import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.common.security.util.SecurityUtils;
 import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
-import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
-import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
@@ -46,8 +43,6 @@ import org.springframework.web.bind.annotation.*;

 import java.util.List;

-import static com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum.*;
-
 /**
 * @author frwcloud
 * @date 2019-01-27 10:04:42
@@ -21,7 +21,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -17,7 +17,6 @@

 package com.pig4cloud.pigx.daemon.quartz.event;

-import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
 import lombok.RequiredArgsConstructor;
@@ -18,8 +18,6 @@
 package com.pig4cloud.pigx.daemon.quartz.service.impl;

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pig4cloud.pigx.daemon.quartz.mapper.SysJobLogMapper;
-import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
 import com.pig4cloud.pigx.daemon.quartz.mapper.SysJobLogMapper;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobLogService;
@@ -18,8 +18,6 @@
 package com.pig4cloud.pigx.daemon.quartz.service.impl;

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pig4cloud.pigx.daemon.quartz.mapper.SysJobMapper;
-import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.mapper.SysJobMapper;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
@@ -17,7 +17,6 @@

 package com.pig4cloud.pigx.daemon.quartz.task;

-import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
 import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -17,8 +17,8 @@

 package com.pig4cloud.pigx.daemon.quartz.util;

-import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
+import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;

 /**
 * 定时任务反射实现接口类
@@ -20,8 +20,6 @@ package com.pig4cloud.pigx.daemon.quartz.util;
 import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
-import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
-import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

@@ -19,8 +19,6 @@ package com.pig4cloud.pigx.daemon.quartz.util;

 import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
-import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
-import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
 import lombok.extern.slf4j.Slf4j;
@@ -22,8 +22,6 @@ import cn.hutool.http.HttpUtil;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
-import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
-import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -20,8 +20,6 @@ package com.pig4cloud.pigx.daemon.quartz.util;
 import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
 import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
-import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
-import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
 import lombok.extern.slf4j.Slf4j;
@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
 import com.pig4cloud.pigx.daemon.quartz.constants.JobTypeQuartzEnum;
 import com.pig4cloud.pigx.daemon.quartz.exception.TaskException;
-import com.pig4cloud.pigx.daemon.quartz.constants.JobTypeQuartzEnum;
 import lombok.extern.slf4j.Slf4j;

 /**
@@ -24,11 +24,6 @@ import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
 import com.pig4cloud.pigx.daemon.quartz.event.SysJobLogEvent;
 import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
-import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
-import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
-import com.pig4cloud.pigx.daemon.quartz.entity.SysJobLog;
-import com.pig4cloud.pigx.daemon.quartz.event.SysJobLogEvent;
-import com.pig4cloud.pigx.daemon.quartz.service.SysJobService;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -20,14 +20,10 @@ package com.pig4cloud.pigx.daemon.quartz.util;
 import com.pig4cloud.pigx.daemon.quartz.config.PigxQuartzFactory;
 import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum;
 import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
-import com.pig4cloud.pigx.daemon.quartz.config.PigxQuartzFactory;
-import com.pig4cloud.pigx.daemon.quartz.entity.SysJob;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.springframework.stereotype.Component;

-import static com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum.*;
-
 /**
 * 定时任务的工具类
 *
@@ -26,7 +26,6 @@ import org.springframework.data.redis.listener.ChannelTopic;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.scheduling.annotation.Async;

-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -2,7 +2,6 @@ package com.pig4cloud.pigx.mp.controller;

 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.common.core.util.R;
@@ -46,7 +46,6 @@ import me.chanjar.weixin.mp.api.WxMpUserBlacklistService;
 import me.chanjar.weixin.mp.api.WxMpUserService;
 import me.chanjar.weixin.mp.api.WxMpUserTagService;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
-import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
 import me.chanjar.weixin.mp.bean.result.WxMpUserList;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
@@ -58,9 +57,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;

 /**
 * @author lengleng
@@ -20,7 +20,6 @@ package com.pig4cloud.pigx.act.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.act.entity.LeaveBill;
@@ -34,7 +33,6 @@ import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,7 +23,6 @@ import com.pig4cloud.pigx.common.core.util.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,7 +17,6 @@

 package com.pig4cloud.pigx.act.service.impl;

-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,7 +25,6 @@ import com.pig4cloud.pigx.act.dto.CommentDto;
 import com.pig4cloud.pigx.act.dto.LeaveBillDto;
 import com.pig4cloud.pigx.act.dto.TaskDTO;
 import com.pig4cloud.pigx.act.entity.LeaveBill;
-import com.pig4cloud.pigx.act.mapper.ActTaskMapper;
 import com.pig4cloud.pigx.act.mapper.LeaveBillMapper;
 import com.pig4cloud.pigx.act.service.ActTaskService;
 import com.pig4cloud.pigx.common.core.constant.PaginationConstants;
@@ -33,7 +33,6 @@ import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.editor.constants.ModelDataJsonConstants;
 import org.activiti.editor.language.json.converter.BpmnJsonConverter;
 import org.activiti.engine.RepositoryService;
-import org.activiti.engine.TaskService;
 import org.activiti.engine.repository.Deployment;
 import org.activiti.engine.repository.Model;
 import org.activiti.engine.repository.ModelQuery;
@@ -17,22 +17,22 @@

 package com.pig4cloud.pigx.pay.controller;

-import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.common.core.util.R;
+import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
 import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.pay.entity.PayChannel;
 import com.pig4cloud.pigx.pay.service.PayChannelService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import org.springframework.http.HttpHeaders;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@@ -132,4 +132,4 @@ public class PayChannelController {
 		return payChannelService.list(Wrappers.query(payChannel));
 	}

-}
+}
@@ -30,7 +30,6 @@ import com.pig4cloud.pigx.pay.service.PayTradeOrderService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -19,7 +19,6 @@ package com.pig4cloud.pigx.pay.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.pig4cloud.pigx.common.core.sensitive.Sensitive;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -1,6 +1,5 @@
 package com.xxl.job.admin.controller;

-import com.xxl.job.admin.core.cron.CronExpression;
 import com.xxl.job.admin.core.exception.XxlJobException;
 import com.xxl.job.admin.core.model.XxlJobGroup;
 import com.xxl.job.admin.core.model.XxlJobInfo;
@@ -29,7 +28,6 @@ import org.springframework.web.bind.annotation.ResponseBody;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.text.ParseException;
 import java.util.*;

 /**
@@ -1,8 +1,8 @@
 package com.xxl.job.admin.controller.resolver;

 import com.xxl.job.admin.core.exception.XxlJobException;
-import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.admin.core.util.JacksonUtil;
+import com.xxl.job.core.biz.model.ReturnT;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -66,4 +66,4 @@ public class WebExceptionResolver implements HandlerExceptionResolver {
 		}
 	}

-}
+}
@@ -19,16 +19,7 @@ package com.xxl.job.admin.core.cron;

 import java.io.Serializable;
 import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TimeZone;
-import java.util.TreeSet;
+import java.util.*;

 /**
 * Provides a parser and evaluator for unix-like cron expressions. Cron expressions
@@ -1,7 +1,7 @@
 package com.xxl.job.admin.core.route.strategy;

-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.IdleBeatParam;
@@ -1,7 +1,7 @@
 package com.xxl.job.admin.core.route.strategy;

-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.ReturnT;
@@ -3,6 +3,7 @@ package com.xxl.job.admin.dao;
 import com.xxl.job.admin.core.model.XxlJobUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;

 /**