task--导入包优化

yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java

@@ -5,11 +5,11 @@
  */
 package co.yixiang.aspect;
 
-import co.yixiang.utils.RequestHolder;
-import com.google.common.collect.ImmutableList;
 import co.yixiang.annotation.Limit;
 import co.yixiang.exception.BadRequestException;
+import co.yixiang.utils.RequestHolder;
 import co.yixiang.utils.StringUtils;
+import com.google.common.collect.ImmutableList;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -21,6 +21,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.core.script.RedisScript;
 import org.springframework.stereotype.Component;
+
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 

yshop-common/src/main/java/co/yixiang/config/ElPermissionConfig.java

@@ -8,6 +8,7 @@ package co.yixiang.config;
 import co.yixiang.utils.SecurityUtils;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.stereotype.Service;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;

yshop-common/src/main/java/co/yixiang/config/RedisConfig.java

@@ -6,11 +6,11 @@
 package co.yixiang.config;
 
 import cn.hutool.core.lang.Assert;
+import co.yixiang.utils.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.ParserConfig;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import lombok.extern.slf4j.Slf4j;
-import co.yixiang.utils.StringUtils;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -29,6 +29,7 @@ import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.RedisSerializer;
+
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;

yshop-common/src/main/java/co/yixiang/config/SwaggerConfig.java

@@ -31,8 +31,10 @@ import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import static com.google.common.collect.Lists.newArrayList;
 import static springfox.documentation.schema.AlternateTypeRules.newRule;
 

yshop-common/src/main/java/co/yixiang/dozer/config/DozerMapperConfig.java

@@ -5,8 +5,6 @@
  */
 package co.yixiang.dozer.config;
 
-import co.yixiang.dozer.service.EJBGenerator;
-import co.yixiang.dozer.service.IGenerator;
 import org.dozer.spring.DozerBeanMapperFactoryBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java

@@ -7,6 +7,7 @@ package co.yixiang.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+
 import java.util.stream.Stream;
 
 /**

yshop-common/src/main/java/co/yixiang/exception/BadRequestException.java

@@ -7,6 +7,7 @@ package co.yixiang.exception;
 
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
+
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 
 /**

yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java

@@ -6,19 +6,22 @@
 package co.yixiang.exception.handler;
 
 import co.yixiang.exception.BadRequestException;
+import co.yixiang.exception.EntityExistException;
+import co.yixiang.exception.EntityNotFoundException;
 import co.yixiang.exception.ErrorRequestException;
 import co.yixiang.utils.ThrowableUtil;
 import lombok.extern.slf4j.Slf4j;
-import co.yixiang.exception.EntityExistException;
-import co.yixiang.exception.EntityNotFoundException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+
 import java.util.Objects;
-import static org.springframework.http.HttpStatus.*;
+
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+import static org.springframework.http.HttpStatus.valueOf;
 
 /**
  * @author Zheng Jie

yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java

@@ -5,8 +5,6 @@
  */
 package co.yixiang.print;
 
-import co.yixiang.utils.OrderUtil;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

yshop-common/src/main/java/co/yixiang/utils/CateDTO.java

@@ -6,8 +6,8 @@
 package co.yixiang.utils;
 
 
-
 import lombok.Data;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

yshop-common/src/main/java/co/yixiang/utils/FileUtil.java

@@ -13,11 +13,21 @@ import cn.hutool.poi.excel.ExcelUtil;
 import co.yixiang.exception.BadRequestException;
 import org.apache.poi.util.IOUtils;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
 import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;

yshop-common/src/main/java/co/yixiang/utils/FontUtil.java

@@ -5,7 +5,8 @@
  */
 package co.yixiang.utils;
 
-import java.awt.*;
+import java.awt.Font;
+import java.awt.FontFormatException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java

@@ -9,8 +9,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 
-import javax.xml.crypto.Data;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Random;

yshop-common/src/main/java/co/yixiang/utils/PageUtil.java

@@ -6,7 +6,11 @@
 package co.yixiang.utils;
 
 import org.springframework.data.domain.Page;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 分页工具

yshop-common/src/main/java/co/yixiang/utils/RedisUtils.java

@@ -8,10 +8,19 @@ package co.yixiang.utils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.core.Cursor;
+import org.springframework.data.redis.core.RedisConnectionUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**

yshop-common/src/main/java/co/yixiang/utils/RequestHolder.java

@@ -7,6 +7,7 @@ package co.yixiang.utils;
 
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+
 import javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
 

yshop-common/src/main/java/co/yixiang/utils/TranslatorUtil.java

@@ -6,6 +6,7 @@
 package co.yixiang.utils;
 
 import cn.hutool.json.JSONArray;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;

yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/util/SwaggerUtil.java

@@ -1,8 +1,18 @@
 package com.github.xiaoymin.knife4j.spring.util;
 
 import io.swagger.models.Model;
-import io.swagger.models.properties.*;
+import io.swagger.models.properties.AbstractProperty;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.PropertyBuilder;
 import io.swagger.models.properties.PropertyBuilder.PropertyId;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
 import org.springframework.beans.BeanUtils;
 
 import java.util.HashMap;

yshop-common/src/main/java/com/github/xiaoymin/knife4j/spring/web/Knife4jController.java

@@ -3,7 +3,12 @@ package com.github.xiaoymin.knife4j.spring.web;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSort;
 import com.github.xiaoymin.knife4j.annotations.ApiSort;
 import com.github.xiaoymin.knife4j.spring.common.SwaggerBootstrapUiHostNameProvider;
-import com.github.xiaoymin.knife4j.spring.model.*;
+import com.github.xiaoymin.knife4j.spring.model.MarkdownFiles;
+import com.github.xiaoymin.knife4j.spring.model.RestHandlerMapping;
+import com.github.xiaoymin.knife4j.spring.model.SwaggerBootstrapUi;
+import com.github.xiaoymin.knife4j.spring.model.SwaggerBootstrapUiPath;
+import com.github.xiaoymin.knife4j.spring.model.SwaggerBootstrapUiTag;
+import com.github.xiaoymin.knife4j.spring.model.SwaggerExt;
 import com.github.xiaoymin.knife4j.spring.util.SwaggerUtil;
 import com.google.common.base.Function;
 import com.google.common.base.Strings;
@@ -51,7 +56,14 @@ import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2Mapper;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE;
@@ -416,4 +428,4 @@ public class Knife4jController {
             }
         }
     }
-}
+}

yshop-common/src/test/java/co/yixiang/utils/FileUtilTest.java

@@ -9,7 +9,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.mock.web.MockMultipartFile;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class FileUtilTest {