🎨 Improving structure / format of the code. 代码导入格式化

2022-01-15 16:22:59 +08:00
1 parent b8e6deacc8
commit bb375e389c
@@ -1,7 +1,6 @@
 package com.pig4cloud.pigx.common.data.tenant;

 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -20,7 +20,6 @@ package com.pig4cloud.pigx.common.gateway.support;
 import cn.hutool.core.collection.CollUtil;
 import com.pig4cloud.pigx.common.core.constant.CacheConstants;
 import com.pig4cloud.pigx.common.gateway.vo.RouteDefinitionVo;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -20,7 +20,6 @@ package com.pig4cloud.pigx.common.gray;
 import com.pig4cloud.pigx.common.gray.feign.GrayFeignRequestInterceptor;
 import com.pig4cloud.pigx.common.gray.rule.GrayLoadBalancerClientConfiguration;
 import feign.RequestInterceptor;
-
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
 import org.springframework.context.annotation.Bean;
@@ -1,9 +1,5 @@
 package com.pig4cloud.pigx.common.gray.rule;

-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.RandomUtil;
@@ -11,20 +7,18 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.cloud.nacos.NacosServiceInstance;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
 import lombok.extern.slf4j.Slf4j;
-import reactor.core.publisher.Mono;
-
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.DefaultRequestContext;
-import org.springframework.cloud.client.loadbalancer.DefaultResponse;
-import org.springframework.cloud.client.loadbalancer.EmptyResponse;
-import org.springframework.cloud.client.loadbalancer.Request;
-import org.springframework.cloud.client.loadbalancer.RequestData;
-import org.springframework.cloud.client.loadbalancer.Response;
+import org.springframework.cloud.client.loadbalancer.*;
 import org.springframework.cloud.loadbalancer.core.NoopServiceInstanceListSupplier;
 import org.springframework.cloud.loadbalancer.core.RoundRobinLoadBalancer;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
 import org.springframework.http.HttpHeaders;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;

 /**
 * @author lengleng
@@ -1,8 +1,8 @@
 package com.pig4cloud.pigx.common.idempotent.aspect;

 import com.pig4cloud.pigx.common.idempotent.annotation.Idempotent;
-import com.pig4cloud.pigx.common.idempotent.expression.KeyResolver;
 import com.pig4cloud.pigx.common.idempotent.exception.IdempotentException;
+import com.pig4cloud.pigx.common.idempotent.expression.KeyResolver;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
@@ -1,15 +1,14 @@
 package com.pig4cloud.pigx.common.security.handler;

-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.hutool.core.util.StrUtil;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;

+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
 * @author lengleng
 * @date 2020/10/6
@@ -1,11 +1,5 @@
 package com.pig4cloud.pigx.common.security.handler;

-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.pig4cloud.pigx.common.core.util.KeyStrResolver;
 import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +12,11 @@ import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 import org.springframework.security.web.savedrequest.RequestCache;
 import org.springframework.security.web.savedrequest.SavedRequest;

+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
 * @author lengleng
 * @date 2021/2/7
@@ -17,9 +17,6 @@

 package com.pig4cloud.pigx.common.security.listener;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.pig4cloud.pigx.common.security.handler.AuthenticationFailureHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
@@ -30,6 +27,9 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
 * @author lengleng
 * @date 2020/03/25 认证失败事件监听器
@@ -17,9 +17,6 @@

 package com.pig4cloud.pigx.common.security.mobile;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import lombok.Getter;
 import lombok.Setter;
@@ -33,6 +30,9 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;

+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
 * @author lengleng
 * @date 2018/1/9 手机号登录验证filter
@@ -1,9 +1,5 @@
 package com.pig4cloud.pigx.common.sentinel.feign;

-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.Map;
-
 import com.alibaba.cloud.sentinel.feign.SentinelContractHolder;
 import feign.Contract;
 import feign.Feign;
@@ -18,6 +14,10 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.StringUtils;

+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.Map;
+
 /**
 * 重写 {@link com.alibaba.cloud.sentinel.feign.SentinelFeign} 支持自动降级注入
 *
@@ -2,7 +2,6 @@ package com.pig4cloud.pigx.common.sequence.range.impl.db;

 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
 import com.pig4cloud.pigx.common.sequence.exception.SeqException;
 import com.pig4cloud.pigx.common.sequence.range.impl.db.provider.SqlProviderFactory;

@@ -1,6 +1,5 @@
 package com.pig4cloud.pigx.common.sequence.range.impl.db.provider;

-import cn.hutool.db.DbUtil;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
 import lombok.RequiredArgsConstructor;
@@ -22,7 +22,6 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.gateway.route.RouteDefinition;
 import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
 import org.springframework.cloud.gateway.support.NameUtils;
-import org.springframework.context.annotation.Primary;
 import springfox.documentation.swagger.web.SwaggerResource;
 import springfox.documentation.swagger.web.SwaggerResourcesProvider;

@@ -1,11 +1,11 @@
 package com.pig4cloud.pigx.gateway.config;

-import java.util.concurrent.TimeUnit;
-
 import com.anji.captcha.service.CaptchaCacheService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;

+import java.util.concurrent.TimeUnit;
+
 /**
 * @author lengleng
 * @date 2020/8/27
@@ -23,7 +23,10 @@ import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants;
 import com.pig4cloud.pigx.common.core.util.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;

 import java.util.Map;

@@ -26,8 +26,8 @@ import com.pig4cloud.pigx.admin.api.entity.SysLog;
 import com.pig4cloud.pigx.admin.api.vo.PreLogVO;
 import com.pig4cloud.pigx.admin.service.SysLogService;
 import com.pig4cloud.pigx.common.core.util.R;
-import com.pig4cloud.pigx.common.security.annotation.Inner;
 import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel;
+import com.pig4cloud.pigx.common.security.annotation.Inner;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,9 +17,6 @@

 package com.pig4cloud.pigx.admin.handler;

-import java.util.HashMap;
-import java.util.List;
-
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.http.HttpUtil;
@@ -38,6 +35,9 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

+import java.util.HashMap;
+import java.util.List;
+
 /**
 * @author lengleng
 * @date 2019/4/8
@@ -17,8 +17,6 @@

 package com.pig4cloud.pigx.admin.handler;

-import java.util.List;
-
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
@@ -35,6 +33,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

+import java.util.List;
+
 /**
 * @author lengleng
 * @date 2019年11月02日
@@ -17,10 +17,6 @@

 package com.pig4cloud.pigx.admin.handler;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
@@ -38,6 +34,10 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
 * @author lengleng
 * @date 2019/4/8
@@ -17,8 +17,6 @@

 package com.pig4cloud.pigx.admin.handler;

-import java.util.List;
-
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
@@ -35,6 +33,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

+import java.util.List;
+
 /**
 * @author lengleng
 * @date 2018/11/18
@@ -17,8 +17,6 @@

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

-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.admin.api.dto.UserInfo;
@@ -35,6 +33,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;

+import java.util.Map;
+
 /**
 * @author lengleng
 * @date 2018年08月16日
@@ -17,9 +17,6 @@

 package com.pig4cloud.pigx.codegen.mapper;

-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +24,9 @@ import com.pig4cloud.pigx.codegen.entity.ColumnEntity;
 import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
 import org.apache.ibatis.annotations.Param;

+import java.util.List;
+import java.util.Map;
+
 /**
 * 代码生成器
 *
@@ -17,12 +17,12 @@

 package com.pig4cloud.pigx.codegen.service;

-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.codegen.entity.GenConfig;

+import java.util.Map;
+
 /**
 * @author lengleng
 * @date 2018/7/29
@@ -17,11 +17,6 @@

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

-import java.io.ByteArrayOutputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipOutputStream;
-
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
@@ -39,6 +34,11 @@ import com.pig4cloud.pigx.codegen.util.GenUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;

+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipOutputStream;
+
 /**
 * @author lengleng
 * @date 2018-07-30
@@ -16,7 +16,10 @@
 */
 package com.pig4cloud.pigx.mp.entity;

-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,7 +17,6 @@
 package com.pig4cloud.pigx.mp.mapper;

 import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
-import com.pig4cloud.pigx.mp.entity.WxAccount;
 import com.pig4cloud.pigx.mp.entity.WxAccountTag;
 import org.apache.ibatis.annotations.Mapper;

@@ -17,7 +17,6 @@

 package com.pig4cloud.pigx.act.config;

-import com.alibaba.druid.util.DruidDataSourceUtils;
 import lombok.AllArgsConstructor;
 import org.activiti.spring.SpringProcessEngineConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -26,14 +26,7 @@ import com.pig4cloud.pigx.pay.service.PayChannelService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;

 /**
 * 渠道
@@ -17,11 +17,6 @@

 package com.pig4cloud.pigx.pay.handler.impl;

-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.extra.servlet.ServletUtil;
@@ -47,6 +42,10 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
 * @author lengleng
 * @date 2019-05-31
@@ -17,10 +17,6 @@

 package com.pig4cloud.pigx.pay.handler.impl;

-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -46,6 +42,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
 * @author lengleng
 * @date 2019-05-31
@@ -1,7 +1,5 @@
 package com.pig4cloud.pigx.pay.handler.impl;

-import javax.servlet.http.HttpServletRequest;
-
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,6 +18,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

+import javax.servlet.http.HttpServletRequest;
+
 /**
 * @author lengleng
 * @date 2021/1/4
@@ -17,11 +17,11 @@

 package com.pig4cloud.pigx.pay.service;

-import java.util.Map;
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pig4cloud.pigx.pay.entity.PayGoodsOrder;

+import java.util.Map;
+
 /**
 * 商品
 *
@@ -16,11 +16,6 @@
 */
 package com.pig4cloud.pigx.pay.service.impl;

-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.pay.entity.PayGoodsOrder;
 import com.pig4cloud.pigx.pay.handler.PayOrderHandler;
@@ -33,6 +28,10 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
 * 商品
 *
@@ -1,11 +1,10 @@
 package com.anjiplus.template.gaea.business.base;

-import org.springframework.context.i18n.LocaleContextHolder;
-
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.dto.BaseDTO;
 import com.anji.plus.gaea.curd.entity.BaseEntity;
 import com.anji.plus.gaea.curd.params.PageParam;
+import org.springframework.context.i18n.LocaleContextHolder;

 /**
 * 项目级的Controller公共处理基类
@@ -3,7 +3,6 @@ package com.anjiplus.template.gaea.business.base;
 import com.anji.plus.gaea.curd.entity.BaseEntity;
 import com.anji.plus.gaea.curd.params.PageParam;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import org.springframework.context.i18n.LocaleContextHolder;

 /**
 * 项目级的Service公共处理基类
@@ -2,7 +2,6 @@ package com.anjiplus.template.gaea.business.base;

 import com.anji.plus.gaea.bean.ResponseBean;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;

 /**
@@ -2,27 +2,22 @@
 package com.anjiplus.template.gaea.business.modules.accessauthority.controller;

 import com.anji.plus.gaea.annotation.Permission;
-import com.anji.plus.gaea.annotation.AccessKey;
-import com.anji.plus.gaea.bean.KeyValue;
 import com.anji.plus.gaea.bean.ResponseBean;
 import com.anji.plus.gaea.bean.TreeNode;
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
 import com.anji.plus.gaea.holder.UserContentHolder;
-import com.anji.plus.gaea.utils.GaeaBeanUtils;
-import com.anji.plus.gaea.utils.GaeaUtils;
-import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
-import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
 import com.anjiplus.template.gaea.business.modules.accessauthority.controller.dto.AccessAuthorityDto;
 import com.anjiplus.template.gaea.business.modules.accessauthority.controller.param.AccessAuthorityParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.web.bind.annotation.*;
+import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
+import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;

 import java.util.List;
-import java.util.Locale;
-import java.util.Map;

 /**
 * @desc 权限管理 controller
@@ -66,4 +61,4 @@ public class AccessAuthorityController
 		return responseSuccessWithData(parentTreeList);
 	}

-}
+}
@@ -1,17 +1,14 @@

 package com.anjiplus.template.gaea.business.modules.accessauthority.controller.dto;

-import java.io.Serializable;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import io.swagger.annotations.ApiModelProperty;
-import com.anji.plus.gaea.annotation.Formatter;
 import lombok.Data;

+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
 /**
 * @description 权限管理 dto
 * @author 木子李·De <lide1202@hotmail.com>
@@ -56,4 +53,4 @@ public class AccessAuthorityDto extends GaeaBaseDTO implements Serializable {
 	@ApiModelProperty(value = "sort")
 	private Integer sort;

-}
+}
@@ -1,14 +1,12 @@
 /**/
 package com.anjiplus.template.gaea.business.modules.accessauthority.controller.param;

-import lombok.Data;
-import java.io.Serializable;
 import com.anji.plus.gaea.annotation.Query;
 import com.anji.plus.gaea.constant.QueryEnum;
 import com.anji.plus.gaea.curd.params.PageParam;
-import java.util.List;
+import lombok.Data;

-import java.util.Date;
+import java.io.Serializable;

 /**
 * @desc AccessAuthority 权限管理查询输入类
@@ -42,4 +40,4 @@ public class AccessAuthorityParam extends PageParam implements Serializable {
 	@Query
 	private Integer enableFlag;

-}
+}
@@ -1,10 +1,8 @@
 package com.anjiplus.template.gaea.business.modules.accessauthority.dao;

-import org.apache.ibatis.annotations.Mapper;
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
-
-import java.util.List;
+import org.apache.ibatis.annotations.Mapper;

 /**
 * AccessAuthority Mapper
@@ -15,4 +13,4 @@ import java.util.List;
@Mapper
 public interface AccessAuthorityMapper extends GaeaBaseMapper<AccessAuthority> {

-}
+}
@@ -1,12 +1,9 @@

 package com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity;

-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import javax.validation.constraints.*;
-import java.util.Date;
+import lombok.Data;

 /**
 * @description 权限管理 entity
@@ -2,9 +2,9 @@
 package com.anjiplus.template.gaea.business.modules.accessauthority.service;

 import com.anji.plus.gaea.bean.TreeNode;
-import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
-import com.anjiplus.template.gaea.business.modules.accessauthority.controller.param.AccessAuthorityParam;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
+import com.anjiplus.template.gaea.business.modules.accessauthority.controller.param.AccessAuthorityParam;
+import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;

 import java.util.List;

@@ -27,4 +27,4 @@ public interface AccessAuthorityService extends GaeaBaseService<AccessAuthorityP
 	 */
 	void scanGaeaSecurityAuthorities();

-}
+}
@@ -1,16 +1,15 @@

 package com.anjiplus.template.gaea.business.modules.accessauthority.service.impl;

-import com.alibaba.fastjson.JSONObject;
 import com.anji.plus.gaea.bean.TreeNode;
 import com.anji.plus.gaea.cache.CacheHelper;
 import com.anji.plus.gaea.constant.Enabled;
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anji.plus.gaea.init.InitRequestUrlMappings;
 import com.anjiplus.template.gaea.business.constant.BusinessConstant;
+import com.anjiplus.template.gaea.business.modules.accessauthority.dao.AccessAuthorityMapper;
 import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
 import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
-import com.anjiplus.template.gaea.business.modules.accessauthority.dao.AccessAuthorityMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.apache.commons.lang3.StringUtils;
@@ -136,4 +135,4 @@ public class AccessAuthorityServiceImpl implements AccessAuthorityService {
 		cacheHelper.hashSet(BusinessConstant.GAEA_SECURITY_AUTHORITIES, securityAuthorityMap);
 	}

-}
+}
@@ -2,23 +2,18 @@
 package com.anjiplus.template.gaea.business.modules.accessrole.controller;

 import com.anji.plus.gaea.annotation.Permission;
-import com.anji.plus.gaea.annotation.AccessKey;
 import com.anji.plus.gaea.bean.ResponseBean;
-import com.anji.plus.gaea.bean.TreeNode;
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
 import com.anji.plus.gaea.holder.UserContentHolder;
-import com.anji.plus.gaea.utils.GaeaBeanUtils;
-import com.anji.plus.gaea.utils.GaeaUtils;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
-import com.anjiplus.template.gaea.business.modules.accessrole.service.AccessRoleService;
 import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.AccessRoleDto;
 import com.anjiplus.template.gaea.business.modules.accessrole.controller.param.AccessRoleParam;
+import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
+import com.anjiplus.template.gaea.business.modules.accessrole.service.AccessRoleService;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;

-import java.util.List;
 import java.util.Map;

 /**
@@ -73,4 +68,4 @@ public class AccessRoleController extends GaeaBaseController<AccessRoleParam, Ac
 		return responseSuccessWithData(data);
 	}

-}
+}
@@ -1,18 +1,15 @@

 package com.anjiplus.template.gaea.business.modules.accessrole.controller.dto;

-import java.io.Serializable;
-import java.util.List;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import io.swagger.annotations.ApiModelProperty;
-import com.anji.plus.gaea.annotation.Formatter;
 import lombok.Data;

+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
 /**
 * @description 角色管理 dto
 * @author 木子李·De <lide1202@hotmail.com>
@@ -43,4 +40,4 @@ public class AccessRoleDto extends GaeaBaseDTO implements Serializable {
 	/** 角色保存的权限 */
 	private List<String> authorityList;

-}
+}
@@ -1,14 +1,12 @@
 /**/
 package com.anjiplus.template.gaea.business.modules.accessrole.controller.param;

-import lombok.Data;
-import java.io.Serializable;
 import com.anji.plus.gaea.annotation.Query;
 import com.anji.plus.gaea.constant.QueryEnum;
 import com.anji.plus.gaea.curd.params.PageParam;
-import java.util.List;
+import lombok.Data;

-import java.util.Date;
+import java.io.Serializable;

 /**
 * @desc AccessRole 角色管理查询输入类
@@ -30,4 +28,4 @@ public class AccessRoleParam extends PageParam implements Serializable {
 	@Query
 	private Integer enableFlag;

-}
+}
@@ -1,11 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.accessrole.dao;

-import org.apache.ibatis.annotations.Mapper;
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

@@ -22,4 +18,4 @@ public interface AccessRoleMapper extends GaeaBaseMapper<AccessRole> {

 	List<String> checkedAuthoritys(@Param("roleCode") String roleCode);

-}
+}
@@ -1,11 +1,9 @@

 package com.anjiplus.template.gaea.business.modules.accessrole.dao.entity;

-import lombok.Data;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import javax.validation.constraints.*;
-import java.util.Date;
+import lombok.Data;

 /**
 * @description 角色管理 entity
@@ -1,10 +1,8 @@
 package com.anjiplus.template.gaea.business.modules.accessrole.dao.entity;

 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
 import lombok.Data;

 import java.util.Date;
@@ -1,13 +1,10 @@

 package com.anjiplus.template.gaea.business.modules.accessrole.service;

-import com.anji.plus.gaea.bean.ResponseBean;
-import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.AccessRoleDto;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
-import com.anjiplus.template.gaea.business.modules.accessrole.controller.param.AccessRoleParam;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
+import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.AccessRoleDto;
+import com.anjiplus.template.gaea.business.modules.accessrole.controller.param.AccessRoleParam;
+import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;

 import java.util.Map;

@@ -33,4 +30,4 @@ public interface AccessRoleService extends GaeaBaseService<AccessRoleParam, Acce
 	 */
 	Boolean saveAuthorityTree(AccessRoleDto accessRoleDto);

-}
+}
@@ -8,10 +8,10 @@ import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
 import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.AccessRoleDto;
 import com.anjiplus.template.gaea.business.modules.accessrole.dao.AccessRoleAuthorityMapper;
+import com.anjiplus.template.gaea.business.modules.accessrole.dao.AccessRoleMapper;
 import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
 import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRoleAuthority;
 import com.anjiplus.template.gaea.business.modules.accessrole.service.AccessRoleService;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.AccessRoleMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.apache.commons.lang3.StringUtils;
@@ -6,21 +6,16 @@ import com.anji.plus.gaea.bean.ResponseBean;
 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
 import com.anji.plus.gaea.curd.service.GaeaBaseService;
 import com.anji.plus.gaea.holder.UserContentHolder;
+import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.AccessUserDto;
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.GaeaUserDto;
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.UpdatePasswordDto;
+import com.anjiplus.template.gaea.business.modules.accessuser.controller.param.AccessUserParam;
 import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
 import com.anjiplus.template.gaea.business.modules.accessuser.service.AccessUserService;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.AccessUserDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.param.AccessUserParam;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;

 import java.util.Map;

@@ -1,15 +1,13 @@

 package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;

-import java.io.Serializable;
+import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
-import io.swagger.annotations.ApiModelProperty;
-import com.anji.plus.gaea.annotation.Formatter;
-import lombok.Data;
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 import javax.validation.constraints.NotBlank;
-import java.util.List;

@ApiModel(value = "修改密码")
@Data
@@ -1,14 +1,12 @@
 /**/
 package com.anjiplus.template.gaea.business.modules.accessuser.controller.param;

-import lombok.Data;
-import java.io.Serializable;
 import com.anji.plus.gaea.annotation.Query;
 import com.anji.plus.gaea.constant.QueryEnum;
 import com.anji.plus.gaea.curd.params.PageParam;
-import java.util.List;
+import lombok.Data;

-import java.util.Date;
+import java.io.Serializable;

 /**
 * @desc AccessUser 用户管理查询输入类
@@ -34,4 +32,4 @@ public class AccessUserParam extends PageParam implements Serializable {
 	@Query
 	private Integer enableFlag;

-}
+}
@@ -1,11 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.accessuser.dao;

-import org.apache.ibatis.annotations.Mapper;
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

@@ -27,4 +23,4 @@ public interface AccessUserMapper extends GaeaBaseMapper<AccessUser> {
 	 */
 	List<String> queryAuthoritiesByLoginName(@Param("loginName") String loginName);

-}
+}
@@ -1,10 +1,10 @@

 package com.anjiplus.template.gaea.business.modules.accessuser.dao.entity;

-import lombok.Data;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
-import javax.validation.constraints.*;
+import lombok.Data;
+
 import java.util.Date;

 /**
@@ -1,12 +1,12 @@

 package com.anjiplus.template.gaea.business.modules.accessuser.service;

+import com.anji.plus.gaea.curd.service.GaeaBaseService;
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.AccessUserDto;
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.GaeaUserDto;
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.UpdatePasswordDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.param.AccessUserParam;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
+import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;

 import java.util.Map;

@@ -5,9 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.anji.plus.gaea.bean.TreeNode;
 import com.anji.plus.gaea.cache.CacheHelper;
 import com.anji.plus.gaea.constant.BaseOperationEnum;
+import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anji.plus.gaea.exception.BusinessException;
 import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anji.plus.gaea.holder.UserContentHolder;
 import com.anji.plus.gaea.utils.GaeaUtils;
 import com.anji.plus.gaea.utils.JwtBean;
@@ -20,11 +20,11 @@ import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessR
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.AccessUserDto;
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.GaeaUserDto;
 import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.UpdatePasswordDto;
+import com.anjiplus.template.gaea.business.modules.accessuser.dao.AccessUserMapper;
 import com.anjiplus.template.gaea.business.modules.accessuser.dao.AccessUserRoleMapper;
 import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
 import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUserRole;
 import com.anjiplus.template.gaea.business.modules.accessuser.service.AccessUserService;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.AccessUserMapper;
 import com.anjiplus.template.gaea.business.util.MD5Util;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -4,9 +4,9 @@ package com.anjiplus.template.gaea.business.modules.dashboard.controller;
 import com.anji.plus.gaea.annotation.Permission;
 import com.anji.plus.gaea.annotation.log.GaeaAuditLog;
 import com.anji.plus.gaea.bean.ResponseBean;
-import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
 import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
 import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto;
+import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -1,13 +1,10 @@
 /**/
 package com.anjiplus.template.gaea.business.modules.dashboard.controller.param;

-import lombok.Data;
-import java.io.Serializable;
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
 import com.anji.plus.gaea.curd.params.PageParam;
+import lombok.Data;

-import java.util.List;
+import java.io.Serializable;

 /**
 * @desc ReportDashboard 大屏设计查询输入类
@@ -1,9 +1,8 @@
 package com.anjiplus.template.gaea.business.modules.dashboard.dao;

-import org.apache.ibatis.annotations.Mapper;
-
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard;
+import org.apache.ibatis.annotations.Mapper;

 /**
 * ReportDashboard Mapper
@@ -1,13 +1,10 @@
 /**/
 package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.param;

-import lombok.Data;
-import java.io.Serializable;
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
 import com.anji.plus.gaea.curd.params.PageParam;
+import lombok.Data;

-import java.util.List;
+import java.io.Serializable;

 /**
 * @desc ReportDashboardWidget 大屏看板数据渲染查询输入类
@@ -1,9 +1,8 @@
 package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao;

-import org.apache.ibatis.annotations.Mapper;
-
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
+import org.apache.ibatis.annotations.Mapper;

 /**
 * ReportDashboardWidget Mapper
@@ -1,9 +1,9 @@

 package com.anjiplus.template.gaea.business.modules.dashboardwidget.service;

+import com.anji.plus.gaea.curd.service.GaeaBaseService;
 import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.param.ReportDashboardWidgetParam;
 import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;

 /**
 * @desc ReportDashboardWidget 大屏看板数据渲染服务接口
@@ -2,13 +2,11 @@
 package com.anjiplus.template.gaea.business.modules.dashboardwidget.service.impl;

 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.ReportDashboardWidgetMapper;
 import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
 import com.anjiplus.template.gaea.business.modules.dashboardwidget.service.ReportDashboardWidgetService;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.ReportDashboardWidgetMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;

 /**
 * @desc ReportDashboardWidget 大屏看板数据渲染服务实现
@@ -1,9 +1,8 @@
 package com.anjiplus.template.gaea.business.modules.dataset.dao;

-import org.apache.ibatis.annotations.Mapper;
-
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet;
+import org.apache.ibatis.annotations.Mapper;

 /**
 * DataSet Mapper
@@ -3,12 +3,12 @@ package com.anjiplus.template.gaea.business.modules.datasetparam.service.impl;

 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
+import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.anjiplus.template.gaea.business.modules.datasetparam.controller.dto.DataSetParamDto;
 import com.anjiplus.template.gaea.business.modules.datasetparam.dao.DataSetParamMapper;
 import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
 import com.anjiplus.template.gaea.business.modules.datasetparam.service.DataSetParamService;
 import com.anjiplus.template.gaea.business.modules.datasetparam.util.ParamsResolverHelper;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -5,7 +5,6 @@ import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
 import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
 import com.anjiplus.template.gaea.business.modules.datasettransform.service.TransformStrategy;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

@@ -1,9 +1,8 @@
 package com.anjiplus.template.gaea.business.modules.datasource.dao;

-import org.apache.ibatis.annotations.Mapper;
-
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
 import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
+import org.apache.ibatis.annotations.Mapper;

 /**
 * DataSource Mapper
@@ -33,7 +33,10 @@ import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;

 import javax.annotation.Resource;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -15,7 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.*;

-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;

 /**
 * (GaeaDict)实体类
@@ -1,15 +1,15 @@
 package com.anjiplus.template.gaea.business.modules.dict.controller;

 import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDictItem;
+import com.anji.plus.gaea.curd.service.GaeaBaseService;
 import com.anjiplus.template.gaea.business.modules.dict.controller.dto.GaeaDictItemDTO;
 import com.anjiplus.template.gaea.business.modules.dict.controller.param.GaeaDictItemParam;
+import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDictItem;
 import com.anjiplus.template.gaea.business.modules.dict.service.GaeaDictItemService;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.beans.factory.annotation.Autowired;

 /**
 * 数据字典项(GaeaDictItem)实体类
@@ -40,4 +40,4 @@ public class GaeaDictItemController extends GaeaBaseController<GaeaDictItemParam
 		return new GaeaDictItemDTO();
 	}

-}
+}
@@ -1,7 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.dict.dao;

-import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDictItem;
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
+import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDictItem;
 import org.apache.ibatis.annotations.Mapper;

 /**
@@ -13,4 +13,4 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
 public interface GaeaDictItemMapper extends GaeaBaseMapper<GaeaDictItem> {

-}
+}
@@ -1,7 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.dict.dao;

-import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDict;
 import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
+import com.anjiplus.template.gaea.business.modules.dict.dao.entity.GaeaDict;
 import org.apache.ibatis.annotations.Mapper;

 /**
@@ -2,8 +2,8 @@ package com.anjiplus.template.gaea.business.modules.dict.dao.entity;

 import com.anji.plus.gaea.annotation.UnionUnique;
 import com.anji.plus.gaea.annotation.UnionUniqueCode;
-import com.anjiplus.template.gaea.business.code.*;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
+import com.anjiplus.template.gaea.business.code.ResponseCode;
 import com.anjiplus.template.gaea.business.constant.BusinessConstant;
 import com.baomidou.mybatisplus.annotation.TableName;

@@ -1,8 +1,6 @@
 package com.anjiplus.template.gaea.business.modules.file.controller.dto;

 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 /**
@@ -1,7 +1,7 @@
 package com.anjiplus.template.gaea.business.modules.file.entity;

-import com.baomidou.mybatisplus.annotation.TableName;
 import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

@@ -1,8 +1,8 @@
 package com.anjiplus.template.gaea.business.modules.file.service;

 import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.file.entity.GaeaFile;
 import com.anjiplus.template.gaea.business.modules.file.controller.param.GaeaFileParam;
+import com.anjiplus.template.gaea.business.modules.file.entity.GaeaFile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;

@@ -2,7 +2,10 @@ package com.anjiplus.template.gaea.business.modules.file.util;

 import lombok.extern.slf4j.Slf4j;

-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;

 /**
 * Created by raodeming on 2021/7/8.
@@ -22,7 +22,6 @@ import com.anjiplus.template.gaea.business.modules.reportexcel.controller.dto.Re
 import com.anjiplus.template.gaea.business.modules.reportexcel.dao.ReportExcelMapper;
 import com.anjiplus.template.gaea.business.modules.reportexcel.dao.entity.ReportExcel;
 import com.anjiplus.template.gaea.business.modules.reportexcel.service.ReportExcelService;
-import com.anjiplus.template.gaea.business.modules.reportexcel.util.XlsSheetUtil;
 import com.anjiplus.template.gaea.business.modules.reportexcel.util.XlsUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.StringUtils;
@@ -33,7 +32,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.*;

 /**
@@ -1,13 +1,13 @@

 package com.anjiplus.template.gaea.business.modules.reportshare.controller.dto;

-import java.io.Serializable;
 import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;

 /**
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="216"
-   height="144"
-   id="svg4136"
-   version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="jsoneditor-icons.svg">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="216"
+        height="144"
+        id="svg4136"
+        version="1.1"
+        inkscape:version="0.91 r"
+        sodipodi:docname="jsoneditor-icons.svg">
  <title
     id="title6512">JSON Editor Icons</title>
  <metadata
@@ -16,7 +16,6 @@
 package com.alibaba.csp.sentinel.dashboard;

 import com.alibaba.csp.sentinel.init.InitExecutor;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

@@ -15,11 +15,7 @@
 */
 package com.alibaba.csp.sentinel.dashboard.auth;

-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;

 /**
 * @author lkxiaolou
@@ -15,10 +15,10 @@
 */
 package com.alibaba.csp.sentinel.dashboard.auth;

-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.stereotype.Component;

+import javax.servlet.http.HttpServletRequest;
+
 /**
 * A fake AuthService implementation, which will pass all user auth checking.
 *
@@ -15,28 +15,23 @@
 */
 package com.alibaba.csp.sentinel.dashboard.client;

-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-
 import com.alibaba.csp.sentinel.adapter.gateway.common.rule.GatewayFlowRule;
 import com.alibaba.csp.sentinel.command.CommandConstants;
-import com.alibaba.csp.sentinel.config.SentinelConfig;
 import com.alibaba.csp.sentinel.command.vo.NodeVo;
+import com.alibaba.csp.sentinel.config.SentinelConfig;
+import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion;
 import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.ApiDefinitionEntity;
 import com.alibaba.csp.sentinel.dashboard.datasource.entity.gateway.GatewayFlowRuleEntity;
+import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.*;
+import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement;
+import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO;
+import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig;
+import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig;
+import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig;
+import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO;
+import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterStateSimpleEntity;
 import com.alibaba.csp.sentinel.dashboard.util.AsyncUtils;
+import com.alibaba.csp.sentinel.dashboard.util.VersionUtils;
 import com.alibaba.csp.sentinel.slots.block.Rule;
 import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
@@ -46,22 +41,6 @@ import com.alibaba.csp.sentinel.slots.system.SystemRule;
 import com.alibaba.csp.sentinel.util.AssertUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.RuleEntity;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity;
-import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement;
-import com.alibaba.csp.sentinel.dashboard.domain.cluster.ClusterClientInfoVO;
-import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterServerStateVO;
-import com.alibaba.csp.sentinel.dashboard.domain.cluster.state.ClusterStateSimpleEntity;
-import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ClusterClientConfig;
-import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerFlowConfig;
-import com.alibaba.csp.sentinel.dashboard.domain.cluster.config.ServerTransportConfig;
-import com.alibaba.csp.sentinel.dashboard.util.VersionUtils;
-
 import org.apache.http.Consts;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -84,6 +63,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;

+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
 /**
 * Communicate with Sentinel client.
 *
@@ -15,13 +15,13 @@
 */
 package com.alibaba.csp.sentinel.dashboard.config;

-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.lang.NonNull;

+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 /**
 * <p>
 * Dashboard local config support.
@@ -15,16 +15,11 @@
 */
 package com.alibaba.csp.sentinel.dashboard.config;

-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 import com.alibaba.csp.sentinel.adapter.servlet.CommonFilter;
 import com.alibaba.csp.sentinel.adapter.servlet.callback.WebCallbackManager;
 import com.alibaba.csp.sentinel.dashboard.auth.AuthorizationInterceptor;
 import com.alibaba.csp.sentinel.dashboard.auth.LoginAuthenticationFilter;
 import com.alibaba.csp.sentinel.util.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +33,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

 import javax.annotation.PostConstruct;
 import javax.servlet.Filter;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;

 /**
 * @author leyou
@@ -15,24 +15,19 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.alibaba.csp.sentinel.dashboard.discovery.AppInfo;
 import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement;
 import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
 import com.alibaba.csp.sentinel.dashboard.domain.Result;
 import com.alibaba.csp.sentinel.dashboard.domain.vo.MachineInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;

 /**
 * @author Carpenter Lee
@@ -15,32 +15,22 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

-import java.util.Date;
-import java.util.List;
-
 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
-import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
-import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
-import com.alibaba.csp.sentinel.slots.block.RuleConstant;
-import com.alibaba.csp.sentinel.util.StringUtil;
-
+import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
 import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.AuthorityRuleEntity;
+import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
 import com.alibaba.csp.sentinel.dashboard.domain.Result;
 import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
-
+import com.alibaba.csp.sentinel.slots.block.RuleConstant;
+import com.alibaba.csp.sentinel.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;

 /**
 * @author Eric Zhao
@@ -15,32 +15,23 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

-import java.util.Date;
-import java.util.List;
-
 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
-import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
-import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
+import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
+import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity;
+import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
+import com.alibaba.csp.sentinel.dashboard.domain.Result;
 import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
 import com.alibaba.csp.sentinel.slots.block.RuleConstant;
 import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.CircuitBreakerStrategy;
 import com.alibaba.csp.sentinel.util.StringUtil;
-
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity;
-import com.alibaba.csp.sentinel.dashboard.domain.Result;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;

 /**
 * Controller regarding APIs of degrade rules. Refactored since 1.8.0.
@@ -15,9 +15,11 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
+import com.alibaba.csp.sentinel.Entry;
+import com.alibaba.csp.sentinel.EntryType;
+import com.alibaba.csp.sentinel.SphU;
+import com.alibaba.csp.sentinel.context.ContextUtil;
+import com.alibaba.csp.sentinel.slots.block.BlockException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
@@ -25,11 +27,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

-import com.alibaba.csp.sentinel.Entry;
-import com.alibaba.csp.sentinel.EntryType;
-import com.alibaba.csp.sentinel.SphU;
-import com.alibaba.csp.sentinel.context.ContextUtil;
-import com.alibaba.csp.sentinel.slots.block.BlockException;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;

@Controller
@RequestMapping(value = "/demo", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -15,33 +15,24 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
-import com.alibaba.csp.sentinel.util.StringUtil;
-
 import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
 import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.FlowRuleEntity;
 import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
 import com.alibaba.csp.sentinel.dashboard.domain.Result;
 import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemoryRuleRepositoryAdapter;
-
+import com.alibaba.csp.sentinel.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;

 /**
 * Flow rule controller.
@@ -16,11 +16,10 @@
 package com.alibaba.csp.sentinel.dashboard.controller;

 import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement;
-import com.alibaba.csp.sentinel.util.StringUtil;
-
 import com.alibaba.csp.sentinel.dashboard.discovery.MachineDiscovery;
 import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
 import com.alibaba.csp.sentinel.dashboard.domain.Result;
+import com.alibaba.csp.sentinel.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,17 +15,11 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
-
+import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity;
 import com.alibaba.csp.sentinel.dashboard.domain.Result;
+import com.alibaba.csp.sentinel.dashboard.domain.vo.MetricVo;
 import com.alibaba.csp.sentinel.dashboard.repository.metric.MetricsRepository;
+import com.alibaba.csp.sentinel.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,10 +28,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

-import com.alibaba.csp.sentinel.util.StringUtil;
-
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity;
-import com.alibaba.csp.sentinel.dashboard.domain.vo.MetricVo;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;

 /**
 * @author leyou
@@ -15,40 +15,31 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

+import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
+import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
+import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
+import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException;
+import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
+import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion;
+import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity;
+import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement;
+import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
+import com.alibaba.csp.sentinel.dashboard.domain.Result;
+import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
+import com.alibaba.csp.sentinel.dashboard.util.VersionUtils;
+import com.alibaba.csp.sentinel.slots.block.RuleConstant;
+import com.alibaba.csp.sentinel.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;

-import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
-import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException;
-import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
-import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement;
-import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
-import com.alibaba.csp.sentinel.dashboard.auth.AuthService;
-import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
-import com.alibaba.csp.sentinel.slots.block.RuleConstant;
-import com.alibaba.csp.sentinel.util.StringUtil;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion;
-import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity;
-import com.alibaba.csp.sentinel.dashboard.domain.Result;
-import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
-import com.alibaba.csp.sentinel.dashboard.util.VersionUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 /**
 * @author Eric Zhao
 * @since 0.2.1
@@ -15,17 +15,12 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.csp.sentinel.command.vo.NodeVo;
-
-import com.alibaba.csp.sentinel.dashboard.domain.ResourceTreeNode;
 import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
+import com.alibaba.csp.sentinel.dashboard.domain.ResourceTreeNode;
 import com.alibaba.csp.sentinel.dashboard.domain.Result;
 import com.alibaba.csp.sentinel.dashboard.domain.vo.ResourceVo;
-
+import com.alibaba.csp.sentinel.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +28,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
 * @author Carpenter Lee
 */
@@ -15,19 +15,14 @@
 */
 package com.alibaba.csp.sentinel.dashboard.controller;

-import java.util.Date;
-import java.util.List;
-
 import com.alibaba.csp.sentinel.dashboard.auth.AuthAction;
 import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType;
-import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
-import com.alibaba.csp.sentinel.util.StringUtil;
-
+import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
 import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.SystemRuleEntity;
 import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo;
-import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient;
 import com.alibaba.csp.sentinel.dashboard.domain.Result;
-
+import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository;
+import com.alibaba.csp.sentinel.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +30,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

+import java.util.Date;
+import java.util.List;
+
 /**
 * @author leyou(lihao)
 */
@@ -17,7 +17,6 @@ package com.alibaba.csp.sentinel.dashboard.controller;

 import com.alibaba.csp.sentinel.dashboard.domain.Result;
 import com.alibaba.csp.sentinel.util.StringUtil;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;