task--导入包优化

yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java

@@ -8,6 +8,7 @@ package co.yixiang.tools.config;
 import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+
 import javax.servlet.MultipartConfigElement;
 import java.io.File;
 

yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java

@@ -4,11 +4,13 @@
 
  */
 package co.yixiang.tools.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
+
 import java.io.Serializable;
 
 /**

yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java

@@ -4,11 +4,12 @@
 
  */
 package co.yixiang.tools.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 
 import java.io.Serializable;
 

yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java

@@ -4,18 +4,18 @@
 
  */
 package co.yixiang.tools.domain;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.sql.Timestamp;
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java

@@ -4,16 +4,17 @@
 
  */
 package co.yixiang.tools.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 
-import java.sql.Timestamp;
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java

@@ -4,13 +4,13 @@
 
  */
 package co.yixiang.tools.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 
-import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**

yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java

@@ -4,16 +4,17 @@
 
  */
 package co.yixiang.tools.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 
-import java.sql.Timestamp;
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.sql.Timestamp;

yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java

@@ -5,21 +5,27 @@
  */
 package co.yixiang.tools.rest;
 
+import co.yixiang.annotation.AnonymousAccess;
 import co.yixiang.logging.aop.log.Log;
+import co.yixiang.tools.domain.AlipayConfig;
+import co.yixiang.tools.domain.vo.TradeVo;
 import co.yixiang.tools.service.AlipayConfigService;
 import co.yixiang.tools.utils.AliPayStatusEnum;
+import co.yixiang.tools.utils.AlipayUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import co.yixiang.annotation.AnonymousAccess;
-import co.yixiang.tools.domain.vo.TradeVo;
-import co.yixiang.tools.domain.AlipayConfig;
-import co.yixiang.tools.utils.AlipayUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+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.RestController;
 import springfox.documentation.annotations.ApiIgnore;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;

yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java

@@ -6,15 +6,20 @@
 package co.yixiang.tools.rest;
 
 import co.yixiang.logging.aop.log.Log;
+import co.yixiang.tools.domain.EmailConfig;
+import co.yixiang.tools.domain.vo.EmailVo;
 import co.yixiang.tools.service.EmailConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import co.yixiang.tools.domain.vo.EmailVo;
-import co.yixiang.tools.domain.EmailConfig;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+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.RestController;
 
 /**
  * 发送邮件

yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java

@@ -4,25 +4,33 @@
 
  */
 package co.yixiang.tools.rest;
-import java.util.Arrays;
+
 import co.yixiang.dozer.service.IGenerator;
-import lombok.AllArgsConstructor;
 import co.yixiang.logging.aop.log.Log;
-import co.yixiang.tools.domain.LocalStorage;
 import co.yixiang.tools.service.LocalStorageService;
-import co.yixiang.tools.service.dto.LocalStorageQueryCriteria;
 import co.yixiang.tools.service.dto.LocalStorageDto;
+import co.yixiang.tools.service.dto.LocalStorageQueryCriteria;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
+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.multipart.MultipartFile;
 
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java

@@ -5,21 +5,28 @@
  */
 package co.yixiang.tools.rest;
 
-import co.yixiang.tools.service.dto.PictureDto;
-import co.yixiang.logging.aop.log.Log;
 import co.yixiang.dozer.service.IGenerator;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import co.yixiang.logging.aop.log.Log;
 import co.yixiang.tools.domain.Picture;
 import co.yixiang.tools.service.PictureService;
+import co.yixiang.tools.service.dto.PictureDto;
 import co.yixiang.tools.service.dto.PictureQueryCriteria;
 import co.yixiang.utils.SecurityUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 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.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 

yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java

@@ -17,7 +17,15 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-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.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.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;

yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java

@@ -16,7 +16,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+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.multipart.MultipartFile;
 
 import java.util.HashMap;

yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java

@@ -5,16 +5,21 @@
  */
 package co.yixiang.tools.rest;
 
+import co.yixiang.tools.domain.VerificationCode;
+import co.yixiang.tools.domain.vo.EmailVo;
 import co.yixiang.tools.service.EmailConfigService;
+import co.yixiang.tools.service.VerificationCodeService;
 import co.yixiang.utils.YshopConstant;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import co.yixiang.tools.domain.VerificationCode;
-import co.yixiang.tools.domain.vo.EmailVo;
-import co.yixiang.tools.service.VerificationCodeService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java

@@ -4,9 +4,10 @@
 
  */
 package co.yixiang.tools.service;
+
+import co.yixiang.common.service.BaseService;
 import co.yixiang.tools.domain.AlipayConfig;
 import co.yixiang.tools.domain.vo.TradeVo;
-import co.yixiang.common.service.BaseService;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java

@@ -4,9 +4,10 @@
 
  */
 package co.yixiang.tools.service;
+
+import co.yixiang.common.service.BaseService;
 import co.yixiang.tools.domain.EmailConfig;
 import co.yixiang.tools.domain.vo.EmailVo;
-import co.yixiang.common.service.BaseService;
 import org.springframework.scheduling.annotation.Async;
 
 /**

yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java

@@ -4,17 +4,18 @@
 
  */
 package co.yixiang.tools.service;
+
+import co.yixiang.common.service.BaseService;
 import co.yixiang.tools.domain.LocalStorage;
 import co.yixiang.tools.service.dto.LocalStorageDto;
-import co.yixiang.common.service.BaseService;
 import co.yixiang.tools.service.dto.LocalStorageQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java

@@ -4,17 +4,18 @@
 
  */
 package co.yixiang.tools.service;
+
+import co.yixiang.common.service.BaseService;
 import co.yixiang.tools.domain.Picture;
 import co.yixiang.tools.service.dto.PictureDto;
-import co.yixiang.common.service.BaseService;
 import co.yixiang.tools.service.dto.PictureQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java

@@ -4,15 +4,17 @@
 
  */
 package co.yixiang.tools.service;
+
 import co.yixiang.common.service.BaseService;
 import co.yixiang.tools.domain.QiniuConfig;
 import co.yixiang.tools.service.dto.QiniuConfigDto;
 import co.yixiang.tools.service.dto.QiniuQueryCriteria;
 import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
+
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java

@@ -4,15 +4,17 @@
 
  */
 package co.yixiang.tools.service;
-import co.yixiang.tools.service.dto.QiniuContentDto;
+
 import co.yixiang.common.service.BaseService;
 import co.yixiang.tools.domain.QiniuContent;
+import co.yixiang.tools.service.dto.QiniuContentDto;
 import co.yixiang.tools.service.dto.QiniuQueryCriteria;
 import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
-import java.io.IOException;
+
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java

@@ -6,8 +6,9 @@
 package co.yixiang.tools.service.dto;
 
 import lombok.Data;
-import java.sql.Timestamp;
+
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java

@@ -5,11 +5,11 @@
  */
 package co.yixiang.tools.service.dto;
 
+import co.yixiang.annotation.Query;
 import lombok.Data;
 
 import java.sql.Timestamp;
 import java.util.List;
-import co.yixiang.annotation.Query;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java

@@ -6,8 +6,9 @@
 package co.yixiang.tools.service.dto;
 
 import lombok.Data;
-import java.sql.Timestamp;
+
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java

@@ -6,8 +6,6 @@
 package co.yixiang.tools.service.dto;
 
 import lombok.Data;
-import java.util.List;
-import co.yixiang.annotation.Query;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java

@@ -6,6 +6,7 @@
 package co.yixiang.tools.service.dto;
 
 import lombok.Data;
+
 import java.io.Serializable;
 
 /**

yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java

@@ -6,8 +6,6 @@
 package co.yixiang.tools.service.dto;
 
 import lombok.Data;
-import java.util.List;
-import co.yixiang.annotation.Query;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java

@@ -6,8 +6,9 @@
 package co.yixiang.tools.service.dto;
 
 import lombok.Data;
-import java.sql.Timestamp;
+
 import java.io.Serializable;
+import java.sql.Timestamp;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java

@@ -6,8 +6,6 @@
 package co.yixiang.tools.service.dto;
 
 import lombok.Data;
-import java.util.List;
-import co.yixiang.annotation.Query;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java

@@ -5,8 +5,8 @@
  */
 package co.yixiang.tools.service.dto;
 
-import lombok.Data;
 import co.yixiang.annotation.Query;
+import lombok.Data;
 
 import java.sql.Timestamp;
 import java.util.List;

yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java

@@ -5,12 +5,12 @@
  */
 package co.yixiang.tools.service.impl;
 
+import co.yixiang.common.service.impl.BaseServiceImpl;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.tools.domain.AlipayConfig;
 import co.yixiang.tools.domain.vo.TradeVo;
 import co.yixiang.tools.service.AlipayConfigService;
 import co.yixiang.tools.service.mapper.AlipayConfigMapper;
-import co.yixiang.common.service.impl.BaseServiceImpl;
-import co.yixiang.exception.BadRequestException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.request.AlipayTradePagePayRequest;

yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java

@@ -7,15 +7,15 @@ package co.yixiang.tools.service.impl;
 
 import cn.hutool.extra.mail.Mail;
 import cn.hutool.extra.mail.MailAccount;
+import co.yixiang.common.service.impl.BaseServiceImpl;
+import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.tools.domain.EmailConfig;
 import co.yixiang.tools.domain.vo.EmailVo;
 import co.yixiang.tools.service.EmailConfigService;
 import co.yixiang.tools.service.mapper.EmailConfigMapper;
-import co.yixiang.common.service.impl.BaseServiceImpl;
-import co.yixiang.exception.BadRequestException;
-import co.yixiang.utils.*;
+import co.yixiang.utils.EncryptUtils;
 import lombok.AllArgsConstructor;
-import co.yixiang.dozer.service.IGenerator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java

@@ -6,36 +6,39 @@
 package co.yixiang.tools.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import co.yixiang.tools.domain.LocalStorage;
 import co.yixiang.common.service.impl.BaseServiceImpl;
-import co.yixiang.exception.BadRequestException;
-import co.yixiang.utils.*;
-import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
+import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.exception.BadRequestException;
+import co.yixiang.tools.domain.LocalStorage;
 import co.yixiang.tools.service.LocalStorageService;
 import co.yixiang.tools.service.dto.LocalStorageDto;
 import co.yixiang.tools.service.dto.LocalStorageQueryCriteria;
 import co.yixiang.tools.service.mapper.LocalStorageMapper;
+import co.yixiang.utils.FileUtil;
+import co.yixiang.utils.SecurityUtils;
+import co.yixiang.utils.StringUtils;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 // 默认不使用缓存
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java

@@ -9,37 +9,42 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import co.yixiang.common.service.impl.BaseServiceImpl;
+import co.yixiang.common.utils.QueryHelpPlus;
+import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.tools.domain.Picture;
 import co.yixiang.tools.service.PictureService;
 import co.yixiang.tools.service.dto.PictureDto;
 import co.yixiang.tools.service.dto.PictureQueryCriteria;
 import co.yixiang.tools.service.mapper.PictureMapper;
-import co.yixiang.common.service.impl.BaseServiceImpl;
-import co.yixiang.exception.BadRequestException;
-import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.utils.FileUtil;
 import co.yixiang.utils.TranslatorUtil;
 import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.YshopConstant;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
-import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.FileUtil;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 // 默认不使用缓存
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java

@@ -5,6 +5,8 @@
  */
 package co.yixiang.tools.service.impl;
 
+import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.tools.domain.QiniuConfig;
 import co.yixiang.tools.domain.QiniuContent;
 import co.yixiang.tools.service.QiNiuService;
@@ -12,7 +14,7 @@ import co.yixiang.tools.service.QiniuConfigService;
 import co.yixiang.tools.service.QiniuContentService;
 import co.yixiang.tools.service.dto.QiniuQueryCriteria;
 import co.yixiang.tools.utils.QiNiuUtil;
-import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.utils.FileUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qiniu.common.QiniuException;
@@ -23,17 +25,19 @@ import com.qiniu.storage.UploadManager;
 import com.qiniu.storage.model.DefaultPutRet;
 import com.qiniu.storage.model.FileInfo;
 import com.qiniu.util.Auth;
-import co.yixiang.exception.BadRequestException;
-import co.yixiang.utils.FileUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java

@@ -5,32 +5,33 @@
  */
 package co.yixiang.tools.service.impl;
 
-import co.yixiang.tools.service.QiniuConfigService;
-import co.yixiang.tools.domain.QiniuConfig;
 import co.yixiang.common.service.impl.BaseServiceImpl;
-import co.yixiang.tools.service.dto.QiniuQueryCriteria;
-import lombok.AllArgsConstructor;
-import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.FileUtil;
+import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.tools.domain.QiniuConfig;
+import co.yixiang.tools.service.QiniuConfigService;
 import co.yixiang.tools.service.dto.QiniuConfigDto;
+import co.yixiang.tools.service.dto.QiniuQueryCriteria;
 import co.yixiang.tools.service.mapper.QiniuConfigMapper;
+import co.yixiang.utils.FileUtil;
+import com.github.pagehelper.PageInfo;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 // 默认不使用缓存
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java

@@ -5,32 +5,33 @@
  */
 package co.yixiang.tools.service.impl;
 
-import co.yixiang.tools.service.dto.QiniuContentDto;
-import co.yixiang.tools.domain.QiniuContent;
 import co.yixiang.common.service.impl.BaseServiceImpl;
-import co.yixiang.tools.service.dto.QiniuQueryCriteria;
-import lombok.AllArgsConstructor;
-import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.FileUtil;
+import co.yixiang.dozer.service.IGenerator;
+import co.yixiang.tools.domain.QiniuContent;
 import co.yixiang.tools.service.QiniuContentService;
+import co.yixiang.tools.service.dto.QiniuContentDto;
+import co.yixiang.tools.service.dto.QiniuQueryCriteria;
 import co.yixiang.tools.service.mapper.QiniuContentMapper;
+import co.yixiang.utils.FileUtil;
+import com.github.pagehelper.PageInfo;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 // 默认不使用缓存
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 
 /**
 * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java

@@ -11,19 +11,22 @@ import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
+import co.yixiang.common.service.impl.BaseServiceImpl;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.tools.domain.VerificationCode;
 import co.yixiang.tools.domain.vo.EmailVo;
 import co.yixiang.tools.service.VerificationCodeService;
 import co.yixiang.tools.service.mapper.VerificationCodeMapper;
-import co.yixiang.common.service.impl.BaseServiceImpl;
-import co.yixiang.exception.BadRequestException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.Collections;
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author hupeng

yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java

@@ -5,8 +5,8 @@
  */
 package co.yixiang.tools.service.mapper;
 
-import co.yixiang.tools.domain.EmailConfig;
 import co.yixiang.common.mapper.CoreMapper;
+import co.yixiang.tools.domain.EmailConfig;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java

@@ -5,8 +5,8 @@
  */
 package co.yixiang.tools.service.mapper;
 
-import co.yixiang.tools.domain.LocalStorage;
 import co.yixiang.common.mapper.CoreMapper;
+import co.yixiang.tools.domain.LocalStorage;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java

@@ -9,6 +9,7 @@ import co.yixiang.tools.domain.AlipayConfig;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.internal.util.AlipaySignature;
 import org.springframework.stereotype.Component;
+
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.Date;