删除代码中多余的引用

api/src/main/java/com/bjtdba/api/ApiApplication.java

@@ -1,10 +1,8 @@
 package com.bjtdba.api;
 
-import com.bjtdba.api.apiservice.OrderService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})

commons-pojo/src/main/java/com/bjtdba/entity/merchant/MerchantConsumptionScoreLog.java

@@ -1,7 +1,6 @@
 package com.bjtdba.entity.merchant;
 
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 
 public class MerchantConsumptionScoreLog {
 

commons-pojo/src/main/java/com/bjtdba/entity/merchant/MerchantYx.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.merchant;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * (RrxMerchantYx)实体类

commons-pojo/src/main/java/com/bjtdba/entity/merchant/StoreBranchJurisdiction.java

@@ -1,7 +1,5 @@
 package com.bjtdba.merchant.entity;
 
-import java.io.Serializable;
-
 /**
  * 门店部门权限表
  * @author 何海强

commons-pojo/src/main/java/com/bjtdba/entity/merchant/SystemConfigValue.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.merchant  ;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 配置表(SystemConfigValue)实体类

commons-pojo/src/main/java/com/bjtdba/entity/order/Recommend.java

@@ -1,8 +1,8 @@
 package com.bjtdba.entity.order;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
-import java.io.Serializable;
 import java.util.List;
 
 /**

commons-pojo/src/main/java/com/bjtdba/entity/order/StoreCart.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.order;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 购物车表(StoreCart)实体类

commons-pojo/src/main/java/com/bjtdba/entity/order/StoreOrder.java

@@ -1,8 +1,8 @@
 package com.bjtdba.entity.order;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.io.Serializable;
 
 /**
  * 订单表(StoreOrder)实体类

commons-pojo/src/main/java/com/bjtdba/entity/order/StoreProduct.java

@@ -4,9 +4,9 @@ import com.bjtdba.utils.DateUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.io.Serializable;
 
 /**
  * 商品表(StoreProduct)实体类

commons-pojo/src/main/java/com/bjtdba/entity/order/StoreProductAttrValue.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.order;
 
-import java.math.BigDecimal;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 商品属性值表(StoreProductAttrValue)实体类

commons-pojo/src/main/java/com/bjtdba/entity/order/User.java

@@ -1,8 +1,8 @@
 package com.bjtdba.entity.order;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.io.Serializable;
 
 /**
  * 用户表(User)实体类

commons-pojo/src/main/java/com/bjtdba/entity/system/FeedbackCategory.java

@@ -2,8 +2,8 @@ package com.bjtdba.entity.system;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 用户反馈分类表(FeedbackCategory)实体类

commons-pojo/src/main/java/com/bjtdba/entity/system/SmsRecord.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.system;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 短信发送记录表(RrxSmsRecord)实体类

commons-pojo/src/main/java/com/bjtdba/entity/system/SystemConfig.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.system;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 配置表(RrxSystemConfig)实体类

commons-pojo/src/main/java/com/bjtdba/entity/system/SystemGroup.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.system;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 组合数据表(SystemGroup)实体类

commons-pojo/src/main/java/com/bjtdba/entity/system/SystemGroupData.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.system;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 组合数据详情表(SystemGroupData)实体类

commons-pojo/src/main/java/com/bjtdba/entity/thirdPartyWares/ThirdPartyGoods.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.thirdPartyWares;
 
-import java.math.BigDecimal;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * (ThirdPartyGoods)实体类

commons-pojo/src/main/java/com/bjtdba/entity/thirdPartyWares/WaresDetail.java

@@ -1,7 +1,6 @@
 package com.bjtdba.entity.thirdPartyWares;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 public class WaresDetail {
 

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserAddress.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.userCenter;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 用户地址表(UserAddress)实体类

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserClockes.java

@@ -1,13 +1,11 @@
 package com.bjtdba.entity.userCenter;
 
 import com.bjtdba.utils.DateUtils;
-import com.fasterxml.jackson.annotation.JacksonInject;
-import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 用户步数表(UserClockes)实体类

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserDisabledCertificate.java

@@ -1,10 +1,9 @@
 package com.bjtdba.entity.userCenter;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 残疾认证表(UserDisabledCertificate)实体类

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserRelation.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.userCenter;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 用户记录表(UserRelation)实体类

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserVideo.java

@@ -3,8 +3,8 @@ package com.bjtdba.entity.userCenter;
 import com.bjtdba.utils.DateUtils;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 用户视频表(UserVideo)实体类

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserVideoBrowse.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.userCenter;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 用户浏览记录表(UserVideoBrowse)实体类

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserVideoComment.java

@@ -2,8 +2,8 @@ package com.bjtdba.entity.userCenter;
 
 import com.bjtdba.utils.DateUtils;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 视频评论表(UserVideoComment)实体类

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserVideoLike.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.userCenter;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 用户点赞记录表(UserVideoLike)实体类

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserVideoShare.java

@@ -1,7 +1,7 @@
 package com.bjtdba.entity.userCenter;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 用户分享记录表(UserVideoShare)实体类

commons-pojo/src/main/java/com/bjtdba/entity/wares/StoreProduct.java

@@ -1,6 +1,5 @@
 package com.bjtdba.entity.wares;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 public class StoreProduct {

commons-pojo/src/main/java/com/bjtdba/utils/FileZipUtils.java

@@ -1,6 +1,9 @@
 package com.bjtdba.utils;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 

commons-pojo/src/main/java/com/bjtdba/utils/SignTop.java

@@ -9,9 +9,9 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.security.MessageDigest;
-import java.util.Map.Entry;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.zip.GZIPInputStream;
 

commons-pojo/src/main/java/com/bjtdba/utils/TreeUtile.java

@@ -1,14 +1,5 @@
 package com.bjtdba.utils;
 
-import cn.hutool.core.lang.tree.Tree;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 public class TreeUtile {
 //
 //    /**

commons-pojo/src/main/java/com/bjtdba/utils/aliyunDysmsapiUtil.java

@@ -1,12 +1,9 @@
 package com.bjtdba.utils;
 
 import com.aliyun.dysmsapi20170525.Client;
-import com.aliyun.tea.*;
-import com.aliyun.dysmsapi20170525.*;
-import com.aliyun.dysmsapi20170525.models.*;
-import com.aliyun.teaopenapi.*;
-import com.aliyun.teaopenapi.models.*;
-import com.aliyun.teautil.*;
+import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
+import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
+import com.aliyun.teaopenapi.models.Config;
 import com.aliyun.teautil.models.RuntimeOptions;
 
 /**

commons-pojo/src/main/java/com/bjtdba/utils/uploadDownload.java

@@ -1,11 +1,15 @@
 package com.bjtdba.utils;
 
-import com.aliyun.oss.*;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.GetObjectRequest;
 import com.aliyun.oss.model.ObjectMetadata;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;

gateWay_server/src/main/java/com/bjtdba/gateWay/GateWayApplication.java

@@ -2,11 +2,6 @@ package com.bjtdba.gateWay;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.filter.HiddenHttpMethodFilter;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilterChain;
-import reactor.core.publisher.Mono;
 
 @SpringBootApplication
 public class GateWayApplication {

gateWay_server/src/main/java/com/bjtdba/gateWay/filter/ApiRequestFilter.java

@@ -13,14 +13,10 @@ import org.springframework.core.Ordered;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-
 import org.springframework.http.HttpStatus;
-
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
 import org.springframework.stereotype.Component;
-
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;

gateWay_server/src/main/java/com/bjtdba/gateWay/filter/LoginFilter.java

@@ -4,10 +4,7 @@ import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
@@ -17,8 +14,7 @@ import java.util.Date;
 import java.util.List;
 
 import static com.bjtdba.utils.Base64Converter.decode;
-import static com.bjtdba.utils.Base64Converter.encode;
-import static com.bjtdba.utils.DESUtil.*;
+import static com.bjtdba.utils.DESUtil.decrypt;
 
 /**
  * 自定一个全局过滤器

merchant_service/src/main/java/com/bjtdba/merchant/controller/HuifuController.java

@@ -12,14 +12,11 @@ import com.huifu.adapay.core.util.AdapaySign;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 /**

merchant_service/src/main/java/com/bjtdba/merchant/controller/MerchantCashierController.java

@@ -9,7 +9,10 @@ import com.easemob.im.server.EMException;
 import com.easemob.im.server.model.EMUser;
 import io.netty.util.internal.ThreadLocalRandom;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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 java.util.HashMap;
 import java.util.Map;

merchant_service/src/main/java/com/bjtdba/merchant/controller/MerchantSettleInController.java

@@ -1,28 +1,13 @@
 package com.bjtdba.merchant.controller;
 
 import com.bjtdba.entity.merchant.MerchantIntention;
-import com.bjtdba.entity.merchant.MerchantQrcode;
-import com.bjtdba.merchant.dao.MerchantQrcodeDao;
 import com.bjtdba.merchant.service.MerchantSettleInService;
-import com.bjtdba.utils.QRCodeUtil;
-import com.bjtdba.utils.uploadDownload;
-import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.sql.Timestamp;
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.Map;
 
 

merchant_service/src/main/java/com/bjtdba/merchant/controller/MerchantYxController.java

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**

merchant_service/src/main/java/com/bjtdba/merchant/controller/StoreBranchController.java

@@ -3,7 +3,6 @@ package com.bjtdba.merchant.controller;
 import com.bjtdba.merchant.entity.StoreBranch;
 import com.bjtdba.merchant.service.StoreBranchJurisdictionService;
 import com.bjtdba.merchant.service.StoreBranchService;
-
 import com.bjtdba.utils.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

merchant_service/src/main/java/com/bjtdba/merchant/controller/StoreStaffController.java

@@ -1,6 +1,7 @@
 package com.bjtdba.merchant.controller;
 
 import com.bjtdba.merchant.entity.StoreStaff;
+import com.bjtdba.merchant.entity.User;
 import com.bjtdba.merchant.service.StoreBranchService;
 import com.bjtdba.merchant.service.StoreStaffService;
 import com.bjtdba.merchant.service.UserService;
@@ -12,11 +13,8 @@ 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  com.bjtdba.merchant.entity.User;
 
-import java.awt.*;
 import java.net.UnknownHostException;
-import java.util.HashMap;
 import java.util.Map;
 
 @RestController

merchant_service/src/main/java/com/bjtdba/merchant/controller/SystemConfigValueController.java

@@ -1,11 +1,14 @@
 package com.bjtdba.merchant.controller;
-import com.bjtdba.entity.merchant.SystemConfigValue ;
+
+import com.bjtdba.entity.merchant.SystemConfigValue;
 import com.bjtdba.merchant.service.SystemConfigValueService;
 import com.bjtdba.utils.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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 javax.annotation.Resource;
 import java.text.SimpleDateFormat;

merchant_service/src/main/java/com/bjtdba/merchant/dao/MerchantIntentionDao.java

@@ -4,8 +4,6 @@ import com.bjtdba.entity.merchant.MerchantIntention;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
-import java.util.Map;
-
 @Repository
 @Mapper
 public interface MerchantIntentionDao {

merchant_service/src/main/java/com/bjtdba/merchant/dao/StoreBranchDao.java

@@ -1,12 +1,11 @@
 package com.bjtdba.merchant.dao;
 
-import java.util.List;
-
 import com.bjtdba.merchant.entity.StoreBranch;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 @Mapper
 public interface StoreBranchDao {

merchant_service/src/main/java/com/bjtdba/merchant/dao/StoreBranchJurisdictionDao.java

@@ -1,12 +1,12 @@
 package com.bjtdba.merchant.dao;
 
-import java.util.List;
-
 import com.bjtdba.merchant.entity.StoreBranchJurisdiction;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 @Mapper
 public interface  StoreBranchJurisdictionDao {

merchant_service/src/main/java/com/bjtdba/merchant/handler/ExceptionHandle.java

@@ -1,6 +1,5 @@
 package com.bjtdba.merchant.handler;
 
-import com.bjtdba.merchant.controller.StoreStaffController;
 import com.bjtdba.utils.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

merchant_service/src/main/java/com/bjtdba/merchant/service/AdapayService.java

@@ -1,7 +1,6 @@
 package com.bjtdba.merchant.service;
 
 import com.bjtdba.entity.merchant.MerchantIntention;
-import com.huifu.adapay.core.exception.BaseAdaPayException;
 
 public interface AdapayService {
     void executeCreateCorpMember(String wx_app_id, MerchantIntention merchantIntention,String url) throws Exception;

merchant_service/src/main/java/com/bjtdba/merchant/service/MerchantSettleInService.java

@@ -1,12 +1,8 @@
 package com.bjtdba.merchant.service;
 
 import com.bjtdba.entity.merchant.MerchantIntention;
-import com.bjtdba.merchant.dto.CorpMemberDto;
-import com.huifu.adapay.core.exception.BaseAdaPayException;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.text.ParseException;
 
 public interface MerchantSettleInService {

merchant_service/src/main/java/com/bjtdba/merchant/service/StoreBranchJurisdictionService.java

@@ -1,17 +1,5 @@
 package com.bjtdba.merchant.service;
 
-import com.bjtdba.merchant.dao.StoreBranchJurisdictionDao;
-import com.bjtdba.merchant.entity.StoreBranchJurisdiction;
-import com.bjtdba.utils.ResponseUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
 public interface StoreBranchJurisdictionService {
 
 

merchant_service/src/main/java/com/bjtdba/merchant/service/StoreBranchService.java

@@ -1,16 +1,8 @@
 package com.bjtdba.merchant.service;
 
-import com.bjtdba.merchant.dao.StoreBranchDao;
 import com.bjtdba.merchant.entity.StoreBranch;
-import com.bjtdba.utils.ResponseUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @Service
 public interface StoreBranchService {
 

merchant_service/src/main/java/com/bjtdba/merchant/service/StoreStaffService.java

@@ -1,20 +1,9 @@
 package com.bjtdba.merchant.service;
 
-import at.favre.lib.crypto.bcrypt.BCrypt;
-import com.bjtdba.merchant.dao.StoreStaffDao;
-import com.bjtdba.merchant.dao.UserDao;
 import com.bjtdba.merchant.entity.StoreStaff;
-import com.bjtdba.merchant.entity.User;
-import com.bjtdba.utils.ResponseUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @Service("storeStaffService")
 public interface StoreStaffService {

merchant_service/src/main/java/com/bjtdba/merchant/service/SystemConfigValueService.java

@@ -1,7 +1,7 @@
 package com.bjtdba.merchant.service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.bjtdba.entity.merchant.SystemConfigValue ;
+import com.bjtdba.entity.merchant.SystemConfigValue;
+
 import java.util.List;
 
 /**

merchant_service/src/main/java/com/bjtdba/merchant/service/UserService.java

@@ -1,14 +1,6 @@
 package com.bjtdba.merchant.service;
 
-import at.favre.lib.crypto.bcrypt.BCrypt;
-import com.bjtdba.merchant.dao.UserDao;
 import com.bjtdba.merchant.entity.User;
-import com.bjtdba.utils.ResponseUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
 
 
 public interface UserService {

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/AdapayServiceImpl.java

@@ -9,7 +9,6 @@ import com.bjtdba.merchant.service.AdapayService;
 import com.bjtdba.merchant.service.MerchantMemberService;
 import com.bjtdba.utils.FileZipUtils;
 import com.bjtdba.utils.uploadDownload;
-import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.huifu.adapay.model.CorpMember;
 import com.huifu.adapay.model.Member;
 import com.huifu.adapay.model.SettleAccount;

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/MerchantCashierServiceImpl.java

@@ -1,20 +1,17 @@
 package com.bjtdba.merchant.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.bjtdba.entity.merchant.MerchantQrcode;
 import com.bjtdba.entity.merchant.SystemConfigValue;
 import com.bjtdba.merchant.dao.*;
 import com.bjtdba.merchant.dto.PayUser;
 import com.bjtdba.merchant.service.MerchantCashierService;
 import com.bjtdba.merchant.vo.MerchantCashierShow;
-import com.bjtdba.utils.DateUtils;
 import com.bjtdba.utils.QRCodeUtil;
 import com.bjtdba.utils.ResponseUtil;
 import com.bjtdba.utils.uploadDownload;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import javafx.scene.input.DataFormat;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +22,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/MerchantSettleInServiceImpl.java

@@ -2,10 +2,10 @@ package com.bjtdba.merchant.service.impl;
 
 import at.favre.lib.crypto.bcrypt.BCrypt;
 import com.bjtdba.entity.merchant.*;
-import com.bjtdba.merchant.entity.User;
-import com.bjtdba.merchant.entity.StoreStaff;
 import com.bjtdba.merchant.config.ResourceConfig;
 import com.bjtdba.merchant.dao.*;
+import com.bjtdba.merchant.entity.StoreStaff;
+import com.bjtdba.merchant.entity.User;
 import com.bjtdba.merchant.service.AdapayService;
 import com.bjtdba.merchant.service.MerchantSettleInService;
 import com.bjtdba.merchant.vo.Address;
@@ -24,16 +24,13 @@ import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/MerchantYxServiceImpl.java

@@ -1,7 +1,6 @@
 package com.bjtdba.merchant.service.impl;
 
 import com.bjtdba.entity.merchant.MerchantYx;
-import com.bjtdba.entity.wares.Merchant;
 import com.bjtdba.merchant.dao.MerchantYxDao;
 import com.bjtdba.merchant.service.MerchantYxService;
 import org.springframework.beans.factory.annotation.Autowired;

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/StoreBranchJurisdictionServiceImpl.java

@@ -4,7 +4,6 @@ import com.bjtdba.merchant.dao.StoreBranchJurisdictionDao;
 import com.bjtdba.merchant.entity.StoreBranchJurisdiction;
 import com.bjtdba.merchant.service.StoreBranchJurisdictionService;
 import com.bjtdba.utils.ResponseUtil;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,7 +11,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
 
 @Service
 public class StoreBranchJurisdictionServiceImpl implements StoreBranchJurisdictionService {

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/StoreBranchServiceImpl.java

@@ -1,9 +1,9 @@
 package com.bjtdba.merchant.service.impl;
 
-import com.bjtdba.merchant.dao.StoreBranchJurisdictionDao;
-import com.bjtdba.merchant.entity.StoreBranchJurisdiction;
 import com.bjtdba.merchant.dao.StoreBranchDao;
+import com.bjtdba.merchant.dao.StoreBranchJurisdictionDao;
 import com.bjtdba.merchant.entity.StoreBranch;
+import com.bjtdba.merchant.entity.StoreBranchJurisdiction;
 import com.bjtdba.merchant.service.StoreBranchService;
 import com.bjtdba.utils.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/SystemConfigValueServiceImpl.java

@@ -1,10 +1,8 @@
 package com.bjtdba.merchant.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.bjtdba.entity.merchant.SystemConfigValue ;
+import com.bjtdba.entity.merchant.SystemConfigValue;
 import com.bjtdba.merchant.dao.SystemConfigValueDao;
 import com.bjtdba.merchant.service.SystemConfigValueService;
-import com.bjtdba.utils.ResponseUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

merchant_service/src/main/java/com/bjtdba/merchant/vo/MerchantAnnualCostOrderVo.java

@@ -1,7 +1,6 @@
 package com.bjtdba.merchant.vo;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 public class MerchantAnnualCostOrderVo {
 

order_service/src/main/java/com/bjtdba/order/controller/ApiOrderController.java

@@ -1,9 +1,10 @@
 package com.bjtdba.order.controller;
 
-import com.bjtdba.order.util.redis.RedisUtil;
 import com.bjtdba.utils.ResponseUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 

order_service/src/main/java/com/bjtdba/order/controller/OrderController.java

@@ -1,13 +1,13 @@
 package com.bjtdba.order.controller;
 
 import com.bjtdba.order.service.OrderService;
-import com.bjtdba.order.vo.OrderUserNameList;
 import com.bjtdba.utils.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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 java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 @RestController

order_service/src/main/java/com/bjtdba/order/controller/RecommendController.java

@@ -17,9 +17,9 @@ import com.bjtdba.utils.ResponseUtil;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
 

order_service/src/main/java/com/bjtdba/order/controller/StoreCartController.java

@@ -1,6 +1,9 @@
 package com.bjtdba.order.controller;
 
-import com.bjtdba.entity.order.*;
+import com.bjtdba.entity.order.StoreCart;
+import com.bjtdba.entity.order.StoreProduct;
+import com.bjtdba.entity.order.StoreProductAttrValue;
+import com.bjtdba.entity.order.User;
 import com.bjtdba.order.service.*;
 import com.bjtdba.order.util.redis.RedisUtil;
 import com.bjtdba.order.vo.MerchantVo;

order_service/src/main/java/com/bjtdba/order/controller/StoreOrderController.java

@@ -1,10 +1,8 @@
 package com.bjtdba.order.controller;
 
-import cn.hutool.db.Page;
 import com.alibaba.fastjson.JSON;
 import com.bjtdba.entity.order.StoreCart;
 import com.bjtdba.order.service.LogService;
-import com.bjtdba.order.service.OrderService;
 import com.bjtdba.order.service.StoreCartService;
 import com.bjtdba.order.service.StoreOrderService;
 import com.bjtdba.order.util.gong.GongApiRequest;
@@ -16,7 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("order_service/orderService/order")

order_service/src/main/java/com/bjtdba/order/dao/LogDao.java

@@ -1,6 +1,5 @@
 package com.bjtdba.order.dao;
 
-import com.bjtdba.entity.order.StoreCart;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 

order_service/src/main/java/com/bjtdba/order/dao/MerchantDao.java

@@ -1,6 +1,5 @@
 package com.bjtdba.order.dao;
 
-import com.bjtdba.entity.wares.Merchant;
 import com.bjtdba.order.vo.MerchantVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

order_service/src/main/java/com/bjtdba/order/dao/OrderMerchantDao.java

@@ -5,7 +5,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 @Repository
 @Mapper

order_service/src/main/java/com/bjtdba/order/dao/StoreCartDao.java

@@ -4,7 +4,6 @@ import com.bjtdba.entity.order.StoreCart;
 import com.bjtdba.order.vo.StoreCartVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

order_service/src/main/java/com/bjtdba/order/dao/StoreOrderDao.java

@@ -5,7 +5,6 @@ import com.bjtdba.order.vo.OrderUserNameList;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

order_service/src/main/java/com/bjtdba/order/dao/StoreOrderMapperDao.java

@@ -1,12 +1,13 @@
 package com.bjtdba.order.dao;
 
-import com.bjtdba.order.vo.*;
+import com.bjtdba.order.vo.StoreGroupOrderVo;
+import com.bjtdba.order.vo.StoreOrderProductVo;
+import com.bjtdba.order.vo.StoreOrderVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Repository
 @Mapper

order_service/src/main/java/com/bjtdba/order/dao/StoreProductDao.java

@@ -4,7 +4,6 @@ import com.bjtdba.entity.order.StoreProduct;
 import com.bjtdba.order.vo.ProductXihuan;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

order_service/src/main/java/com/bjtdba/order/dao/StoreRefundOrderDao.java

@@ -3,8 +3,6 @@ package com.bjtdba.order.dao;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
-import java.math.BigDecimal;
-
 @Repository
 @Mapper
 public interface StoreRefundOrderDao {

order_service/src/main/java/com/bjtdba/order/handler/ExceptionHandle.java

@@ -8,10 +8,8 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.http.HttpStatus;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 @RestControllerAdvice
 public class ExceptionHandle {

order_service/src/main/java/com/bjtdba/order/service/RecommendService.java

@@ -3,8 +3,6 @@ package com.bjtdba.order.service;
 import com.bjtdba.entity.order.Recommend;
 import com.bjtdba.order.vo.CategoryVo;
 import com.bjtdba.order.vo.RecommendDetailVo;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 
 import java.util.Date;
 import java.util.List;

order_service/src/main/java/com/bjtdba/order/service/StoreCartService.java

@@ -3,8 +3,6 @@ package com.bjtdba.order.service;
 import com.bjtdba.entity.order.StoreCart;
 import com.bjtdba.order.vo.MerchantVo;
 import com.bjtdba.order.vo.StoreCartVo;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 
 import java.util.List;
 

order_service/src/main/java/com/bjtdba/order/service/StoreOrderService.java

@@ -1,6 +1,5 @@
 package com.bjtdba.order.service;
 
-import com.bjtdba.entity.order.StoreOrder;
 import com.bjtdba.order.vo.StoreGroupOrderVo;
 import com.bjtdba.order.vo.StoreOrderProductVo;
 import com.bjtdba.order.vo.StoreOrderVo;

order_service/src/main/java/com/bjtdba/order/service/StoreProductService.java

@@ -2,8 +2,6 @@ package com.bjtdba.order.service;
 
 import com.bjtdba.entity.order.StoreProduct;
 import com.bjtdba.order.vo.ProductXihuan;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 
 import java.math.BigDecimal;
 import java.util.List;

order_service/src/main/java/com/bjtdba/order/service/impl/OrderServiceImpl.java

@@ -15,7 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class OrderServiceImpl implements OrderService {

order_service/src/main/java/com/bjtdba/order/service/impl/RecommendServiceImpl.java

@@ -6,9 +6,6 @@ import com.bjtdba.order.service.RecommendService;
 import com.bjtdba.order.vo.CategoryVo;
 import com.bjtdba.order.vo.RecommendDetailVo;
 import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
 
 import javax.annotation.Resource;
 import java.util.Date;

order_service/src/main/java/com/bjtdba/order/service/impl/StoreCartServiceImpl.java

@@ -9,9 +9,6 @@ import com.bjtdba.order.vo.MerchantVo;
 import com.bjtdba.order.vo.StoreCartVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
 
 import javax.annotation.Resource;
 import java.util.List;

order_service/src/main/java/com/bjtdba/order/service/impl/StoreProductAttrValueServiceImpl.java

@@ -3,10 +3,10 @@ package com.bjtdba.order.service.impl;
 import com.bjtdba.entity.order.StoreProductAttrValue;
 import com.bjtdba.order.dao.StoreProductAttrValueDao;
 import com.bjtdba.order.service.StoreProductAttrValueService;
-import org.springframework.stereotype.Service;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;

order_service/src/main/java/com/bjtdba/order/service/impl/UserServiceImpl.java

@@ -3,10 +3,10 @@ package com.bjtdba.order.service.impl;
 import com.bjtdba.entity.order.User;
 import com.bjtdba.order.dao.UserDao;
 import com.bjtdba.order.service.UserService;
-import org.springframework.stereotype.Service;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 

order_service/src/main/java/com/bjtdba/order/util/gong/HttpUtil.java

@@ -1,15 +1,6 @@
 package com.bjtdba.order.util.gong;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Map;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.URIException;
+import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.params.HttpMethodParams;
@@ -18,6 +9,11 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Map;
+
 
 /**
  * @ClassName com.yizhilu.os.core.util.web.HttpUtil

order_service/src/main/java/com/bjtdba/order/util/redis/RedisUtil.java

@@ -1,17 +1,16 @@
 package com.bjtdba.order.util.redis;
-import java.util.Collection;
-import java.util.List;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 
 /**

order_service/src/main/java/com/bjtdba/order/vo/RecommendVo.java

@@ -1,7 +1,5 @@
 package com.bjtdba.order.vo;
 
-import java.util.Date;
-
 public class RecommendVo {
     private Integer id;
     /**

pension_service/src/main/java/com/bjtdba/pension/controller/PensionController.java

@@ -3,8 +3,10 @@ package com.bjtdba.pension.controller;
 import com.bjtdba.pension.entity.StoreProductAttrValue;
 import com.bjtdba.pension.service.PensionService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-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 java.math.BigDecimal;
 

poster_service/src/main/java/com/bjtdba/poster/controller/IndexController.java

@@ -2,7 +2,10 @@ package com.bjtdba.poster.controller;
 
 import com.bjtdba.poster.service.PosterService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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 java.util.Map;
 

poster_service/src/main/java/com/bjtdba/poster/service/Impl/PosterServiceImpl.java

@@ -1,7 +1,5 @@
 package com.bjtdba.poster.service.Impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.bjtdba.entity.poster.SharePosters;
 import com.bjtdba.entity.poster.SystemAttachment;
 import com.bjtdba.entity.userCenter.User;
@@ -12,14 +10,11 @@ import com.bjtdba.poster.entity.Poster;
 import com.bjtdba.poster.service.PosterService;
 import com.bjtdba.poster.service.QrCodeService;
 import com.bjtdba.poster.utils.FontUtil;
-import com.bjtdba.poster.utils.HttpUtil;
 import com.bjtdba.poster.utils.PosterUtil;
-import com.bjtdba.utils.DateUtils;
 import com.bjtdba.utils.ResponseUtil;
 import com.bjtdba.utils.uploadDownload;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
@@ -30,7 +25,6 @@ import sun.font.FontDesignMetrics;
 import java.awt.*;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 

poster_service/src/main/java/com/bjtdba/poster/service/Impl/QrCodeServiceImpl.java

@@ -9,7 +9,6 @@ import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;

poster_service/src/main/java/com/bjtdba/poster/utils/FontUtil.java

@@ -1,9 +1,10 @@
 package com.bjtdba.poster.utils;
 
-import org.springframework.util.ResourceUtils;
-
 import java.awt.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class FontUtil {
 

poster_service/src/main/java/com/bjtdba/poster/utils/HttpUtil.java

@@ -1,15 +1,6 @@
 package com.bjtdba.poster.utils;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Map;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.URIException;
+import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.params.HttpMethodParams;
@@ -18,6 +9,11 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Map;
+
 
 /**
  * @ClassName com.yizhilu.os.core.util.web.HttpUtil

system_service/src/main/java/com/bjtdba/system/controller/CityController.java

@@ -1,7 +1,6 @@
 package com.bjtdba.system.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.bjtdba.entity.system.Regions;
 import com.bjtdba.system.service.RegionsService;
 import com.bjtdba.system.util.redis.RedisUtil;

system_service/src/main/java/com/bjtdba/system/controller/FeedbackCategoryController.java

@@ -4,9 +4,6 @@ import com.bjtdba.entity.system.FeedbackCategory;
 import com.bjtdba.system.service.FeedbackCategoryService;
 import com.bjtdba.system.vo.FeedbackVo;
 import com.bjtdba.utils.ResponseUtil;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

system_service/src/main/java/com/bjtdba/system/controller/NewHomeController.java

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;

system_service/src/main/java/com/bjtdba/system/controller/SystemConfigController.java

@@ -1,16 +1,14 @@
 package com.bjtdba.system.controller;
 
-import cn.hutool.json.JSONObject;
 import com.alibaba.fastjson.JSON;
 import com.bjtdba.entity.system.SystemConfig;
 import com.bjtdba.system.service.SystemConfigService;
 import com.bjtdba.utils.ResponseUtil;
 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 org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 

system_service/src/main/java/com/bjtdba/system/dao/FeedbackCategoryDao.java

@@ -2,10 +2,10 @@ package com.bjtdba.system.dao;
 
 import com.bjtdba.entity.system.FeedbackCategory;
 import com.bjtdba.system.vo.FeedbackVo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
+
 import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 用户反馈分类表(FeedbackCategory)表数据库访问层