Browse Source

优化代码

tianboguang 3 years ago
parent
commit
bda2f54593
100 changed files with 185 additions and 758 deletions
  1. 2 10
      platform-api/src/main/java/com/platform/api/ApiAuthController.java
  2. 0 1
      platform-api/src/main/java/com/platform/api/ApiBrandController.java
  3. 0 1
      platform-api/src/main/java/com/platform/api/ApiBuyController.java
  4. 8 5
      platform-api/src/main/java/com/platform/api/ApiCartController.java
  5. 4 1
      platform-api/src/main/java/com/platform/api/ApiCommentController.java
  6. 4 2
      platform-api/src/main/java/com/platform/api/ApiCouponController.java
  7. 0 3
      platform-api/src/main/java/com/platform/api/ApiFeedbackController.java
  8. 4 1
      platform-api/src/main/java/com/platform/api/ApiFootprintController.java
  9. 4 4
      platform-api/src/main/java/com/platform/api/ApiOrderController.java
  10. 4 2
      platform-api/src/main/java/com/platform/api/ApiPayController.java
  11. 0 1
      platform-api/src/main/java/com/platform/api/ApiRegisterController.java
  12. 0 1
      platform-api/src/main/java/com/platform/api/ApiTestController.java
  13. 4 1
      platform-api/src/main/java/com/platform/api/ApiTmLiveShowController.java
  14. 0 2
      platform-api/src/main/java/com/platform/api/ApiUploadController.java
  15. 0 4
      platform-api/src/main/java/com/platform/api/LogisticsController.java
  16. 1 1
      platform-api/src/main/java/com/platform/dao/ApiTmBrandAdminDao.java
  17. 1 1
      platform-api/src/main/java/com/platform/dao/ApiTmBrandTypeDao.java
  18. 1 1
      platform-api/src/main/java/com/platform/dao/ApiTmDealLogDao.java
  19. 1 1
      platform-api/src/main/java/com/platform/dao/ApiTmGoodsDetailLogDao.java
  20. 1 1
      platform-api/src/main/java/com/platform/dao/ApiTmLiveRoomInfoDao.java
  21. 1 1
      platform-api/src/main/java/com/platform/dao/ApiTmSceneCensusDao.java
  22. 1 1
      platform-api/src/main/java/com/platform/dao/ApiTmSlideShowDao.java
  23. 0 1
      platform-api/src/main/java/com/platform/dao/ApiUserMapper.java
  24. 0 1
      platform-api/src/main/java/com/platform/entity/AdPositionVo.java
  25. 3 2
      platform-api/src/main/java/com/platform/entity/ApiTmBrandAdminVo.java
  26. 3 2
      platform-api/src/main/java/com/platform/entity/ApiTmBrandTypeVo.java
  27. 4 3
      platform-api/src/main/java/com/platform/entity/ApiTmDealLogVo.java
  28. 4 3
      platform-api/src/main/java/com/platform/entity/ApiTmGoodsDetailLogVo.java
  29. 4 3
      platform-api/src/main/java/com/platform/entity/ApiTmLiveRoomInfoVo.java
  30. 4 3
      platform-api/src/main/java/com/platform/entity/ApiTmSceneCensusVo.java
  31. 3 2
      platform-api/src/main/java/com/platform/entity/ApiTmSlideShowVo.java
  32. 0 1
      platform-api/src/main/java/com/platform/entity/AttributeCategoryVo.java
  33. 0 1
      platform-api/src/main/java/com/platform/entity/AttributeVo.java
  34. 0 1
      platform-api/src/main/java/com/platform/entity/BrandVo.java
  35. 0 1
      platform-api/src/main/java/com/platform/entity/CartVo.java
  36. 0 1
      platform-api/src/main/java/com/platform/entity/ChannelVo.java
  37. 0 1
      platform-api/src/main/java/com/platform/entity/CollectVo.java
  38. 0 1
      platform-api/src/main/java/com/platform/entity/CommentPictureVo.java
  39. 0 1
      platform-api/src/main/java/com/platform/entity/GoodsAttributeVo.java
  40. 0 1
      platform-api/src/main/java/com/platform/entity/GoodsGalleryVo.java
  41. 0 1
      platform-api/src/main/java/com/platform/entity/GoodsIssueVo.java
  42. 0 3
      platform-api/src/main/java/com/platform/entity/GoodsSpecificationVo.java
  43. 0 1
      platform-api/src/main/java/com/platform/entity/KeywordsVo.java
  44. 0 1
      platform-api/src/main/java/com/platform/entity/OrderGoodsVo.java
  45. 0 1
      platform-api/src/main/java/com/platform/entity/ProductVo.java
  46. 0 1
      platform-api/src/main/java/com/platform/entity/RelatedGoodsVo.java
  47. 0 1
      platform-api/src/main/java/com/platform/entity/SearchHistoryVo.java
  48. 0 1
      platform-api/src/main/java/com/platform/entity/SmsLogVo.java
  49. 0 1
      platform-api/src/main/java/com/platform/entity/SpecificationVo.java
  50. 0 1
      platform-api/src/main/java/com/platform/entity/TopicCategoryVo.java
  51. 0 1
      platform-api/src/main/java/com/platform/entity/TopicVo.java
  52. 0 1
      platform-api/src/main/java/com/platform/entity/UserLevelVo.java
  53. 0 1
      platform-api/src/main/java/com/platform/entity/UserVo.java
  54. 0 1
      platform-api/src/main/java/com/platform/service/ApiCouponService.java
  55. 0 3
      platform-api/src/main/java/com/platform/service/ApiGoodsService.java
  56. 9 20
      platform-api/src/main/java/com/platform/service/ApiOrderService.java
  57. 0 1
      platform-api/src/main/java/com/platform/service/ApiRecommendService.java
  58. 1 1
      platform-api/src/main/java/com/platform/service/ApiTmBrandAdminService.java
  59. 1 1
      platform-api/src/main/java/com/platform/service/ApiTmBrandTypeService.java
  60. 1 1
      platform-api/src/main/java/com/platform/service/ApiTmDealLogService.java
  61. 1 1
      platform-api/src/main/java/com/platform/service/ApiTmGoodsDetailLogService.java
  62. 1 1
      platform-api/src/main/java/com/platform/service/ApiTmLiveRoomInfoService.java
  63. 1 1
      platform-api/src/main/java/com/platform/service/ApiTmSceneCensusService.java
  64. 1 1
      platform-api/src/main/java/com/platform/service/ApiTmSlideShowService.java
  65. 0 6
      platform-api/src/main/java/com/platform/service/ApiUserCouponService.java
  66. 0 2
      platform-api/src/main/java/com/platform/service/SceneProService.java
  67. 0 1
      platform-api/src/main/java/com/platform/service/UserService.java
  68. 0 7
      platform-api/src/main/java/com/platform/service/custom/MyApiTmBrandAdminService.java
  69. 1 0
      platform-api/src/main/java/com/platform/service/custom/MyApiTmSlideShowService.java
  70. 0 1
      platform-api/src/main/java/com/platform/service/custom/MyGoodsDetailLogService.java
  71. 2 2
      platform-api/src/main/java/com/platform/service/impl/ApiTmBrandAdminServiceImpl.java
  72. 2 2
      platform-api/src/main/java/com/platform/service/impl/ApiTmBrandTypeServiceImpl.java
  73. 2 2
      platform-api/src/main/java/com/platform/service/impl/ApiTmDealLogServiceImpl.java
  74. 2 2
      platform-api/src/main/java/com/platform/service/impl/ApiTmGoodsDetailLogServiceImpl.java
  75. 2 2
      platform-api/src/main/java/com/platform/service/impl/ApiTmLiveRoomInfoServiceImpl.java
  76. 2 2
      platform-api/src/main/java/com/platform/service/impl/ApiTmSceneCensusServiceImpl.java
  77. 2 2
      platform-api/src/main/java/com/platform/service/impl/ApiTmSlideShowServiceImpl.java
  78. 1 22
      platform-api/src/main/java/com/platform/service/impl/SceneProServiceImpl.java
  79. 10 12
      platform-api/src/main/java/com/platform/util/CommonUtil.java
  80. 1 1
      platform-api/src/main/java/com/platform/util/MyX509TrustManager.java
  81. 4 4
      platform-api/src/main/java/com/platform/util/OrderDealLogUtils.java
  82. 1 5
      platform-api/src/main/java/com/platform/util/wechat/WechatUtil.java
  83. 34 0
      platform-common/pom.xml
  84. 0 2
      platform-common/src/main/java/com/platform/cache/J2CacheUtils.java
  85. 0 1
      platform-common/src/main/java/com/platform/config/SwaggerConfig.java
  86. 1 1
      platform-common/src/main/java/com/platform/dao/SysUserBrandDao.java
  87. 1 2
      platform-common/src/main/java/com/platform/dao/custom/MySysUserBrandDao.java
  88. 0 1
      platform-common/src/main/java/com/platform/entity/SysSmsLogEntity.java
  89. 3 3
      platform-common/src/main/java/com/platform/entity/SysUserBrand.java
  90. 0 1
      platform-common/src/main/java/com/platform/entity/WxLiveRoomRequestVo.java
  91. 7 10
      platform-common/src/main/java/com/platform/oss/QcloudCloudStorageService.java
  92. 1 1
      platform-common/src/main/java/com/platform/oss/QiniuCloudStorageService.java
  93. 2 10
      platform-common/src/main/java/com/platform/page/PageHelper.java
  94. 1 1
      platform-common/src/main/java/com/platform/service/ISysUserBrandService.java
  95. 3 6
      platform-common/src/main/java/com/platform/service/custom/MySysUserBrandService.java
  96. 2 2
      platform-common/src/main/java/com/platform/service/impl/SysUserBrandServiceImpl.java
  97. 4 1
      platform-common/src/main/java/com/platform/utils/CommonDataUtils.java
  98. 0 506
      platform-common/src/main/java/com/platform/utils/FileUtils.java
  99. 12 13
      platform-common/src/main/java/com/platform/utils/HttpUtils.java
  100. 0 0
      platform-common/src/main/java/com/platform/utils/JwtUtil.java

+ 2 - 10
platform-api/src/main/java/com/platform/api/ApiAuthController.java

@@ -1,13 +1,6 @@
 package com.platform.api;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayClient;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.request.AlipaySystemOauthTokenRequest;
-import com.alipay.api.request.AlipayUserInfoShareRequest;
-import com.alipay.api.response.AlipaySystemOauthTokenResponse;
-import com.alipay.api.response.AlipayUserInfoShareResponse;
 import com.platform.annotation.IgnoreAuth;
 import com.platform.entity.*;
 import com.platform.service.ApiUserService;
@@ -17,8 +10,8 @@ import com.platform.service.impl.ZhiHouseService;
 import com.platform.util.ApiBaseAction;
 import com.platform.util.ApiUserUtils;
 import com.platform.util.CommonUtil;
-import com.platform.utils.*;
-import com.platform.validator.Assert;
+import com.platform.utils.CharUtil;
+import com.platform.utils.WXCore;
 import com.qiniu.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -26,7 +19,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 0 - 1
platform-api/src/main/java/com/platform/api/ApiBrandController.java

@@ -12,7 +12,6 @@ import com.platform.util.ApiBaseAction;
 import com.platform.util.ApiPageUtils;
 import com.platform.utils.Query;
 import com.platform.vos.RequestScene;
-import com.platform.vos.ResponseScene;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;

+ 0 - 1
platform-api/src/main/java/com/platform/api/ApiBuyController.java

@@ -1,6 +1,5 @@
 package com.platform.api;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.platform.annotation.LoginUser;
 import com.platform.cache.J2CacheUtils;

+ 8 - 5
platform-api/src/main/java/com/platform/api/ApiCartController.java

@@ -6,11 +6,8 @@ import com.platform.annotation.IgnoreAuth;
 import com.platform.annotation.LoginUser;
 import com.platform.cache.J2CacheUtils;
 import com.platform.entity.*;
-import com.platform.enums.ResultCodeEnum;
-import com.platform.exception.CommonBaseException;
 import com.platform.service.*;
 import com.platform.util.ApiBaseAction;
-
 import com.platform.utils.JwtUtil;
 import com.qiniu.util.StringUtils;
 import io.jsonwebtoken.Claims;
@@ -20,11 +17,17 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-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;
 import java.math.RoundingMode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static com.platform.interceptor.AuthorizationInterceptor.LOGIN_TOKEN_KEY;
 

+ 4 - 1
platform-api/src/main/java/com/platform/api/ApiCommentController.java

@@ -15,7 +15,10 @@ import com.platform.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
 

+ 4 - 2
platform-api/src/main/java/com/platform/api/ApiCouponController.java

@@ -13,9 +13,11 @@ import com.platform.service.*;
 import com.platform.util.ApiBaseAction;
 import com.platform.utils.CharUtil;
 import com.platform.utils.CommonDataUtils;
-
 import com.platform.utils.StringUtils;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

+ 0 - 3
platform-api/src/main/java/com/platform/api/ApiFeedbackController.java

@@ -1,9 +1,6 @@
 package com.platform.api;
 
-import com.alibaba.fastjson.JSONObject;
-import com.platform.annotation.LoginUser;
 import com.platform.entity.FeedbackVo;
-import com.platform.entity.UserVo;
 import com.platform.service.ApiFeedbackService;
 import com.platform.util.ApiBaseAction;
 import io.swagger.annotations.Api;

+ 4 - 1
platform-api/src/main/java/com/platform/api/ApiFootprintController.java

@@ -13,7 +13,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
 

+ 4 - 4
platform-api/src/main/java/com/platform/api/ApiOrderController.java

@@ -1,6 +1,5 @@
 package com.platform.api;
 
-import com.platform.annotation.IgnoreAuth;
 import com.platform.annotation.LoginUser;
 import com.platform.entity.*;
 import com.platform.enums.OrderStatusEnum;
@@ -17,14 +16,15 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.ListUtils;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
-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.time.Duration;
 import java.time.LocalDateTime;

+ 4 - 2
platform-api/src/main/java/com/platform/api/ApiPayController.java

@@ -1,7 +1,6 @@
 package com.platform.api;
 
 import com.platform.annotation.IgnoreAuth;
-import com.platform.annotation.LoginUser;
 import com.platform.cache.J2CacheUtils;
 import com.platform.entity.*;
 import com.platform.service.*;
@@ -18,7 +17,10 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-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.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;

+ 0 - 1
platform-api/src/main/java/com/platform/api/ApiRegisterController.java

@@ -3,7 +3,6 @@ package com.platform.api;
 import com.platform.annotation.IgnoreAuth;
 import com.platform.entity.Result;
 import com.platform.service.ApiUserService;
-
 import com.platform.validator.Assert;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 0 - 1
platform-api/src/main/java/com/platform/api/ApiTestController.java

@@ -5,7 +5,6 @@ import com.platform.annotation.LoginUser;
 import com.platform.entity.Result;
 import com.platform.entity.UserVo;
 import com.platform.service.ApiUserService;
-
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

+ 4 - 1
platform-api/src/main/java/com/platform/api/ApiTmLiveShowController.java

@@ -18,7 +18,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-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.math.BigDecimal;
 import java.util.ArrayList;

+ 0 - 2
platform-api/src/main/java/com/platform/api/ApiUploadController.java

@@ -4,10 +4,8 @@ import com.platform.annotation.IgnoreAuth;
 import com.platform.oss.OSSFactory;
 import com.platform.util.ApiBaseAction;
 import com.platform.utils.RRException;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

+ 0 - 4
platform-api/src/main/java/com/platform/api/LogisticsController.java

@@ -4,12 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.platform.entity.GoodsVo;
 import com.platform.service.ApiGoodsService;
 import com.platform.util.ApiBaseAction;
-import com.platform.utils.HttpUtils;
 import com.platform.utils.LogisticsUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**

+ 1 - 1
platform-api/src/main/java/com/platform/dao/ApiTmBrandAdminDao.java

@@ -1,7 +1,7 @@
 package com.platform.dao;
 
-import com.platform.entity.ApiTmBrandAdminVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.ApiTmBrandAdminVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/dao/ApiTmBrandTypeDao.java

@@ -1,7 +1,7 @@
 package com.platform.dao;
 
-import com.platform.entity.ApiTmBrandTypeVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.ApiTmBrandTypeVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/dao/ApiTmDealLogDao.java

@@ -1,7 +1,7 @@
 package com.platform.dao;
 
-import com.platform.entity.ApiTmDealLogVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.ApiTmDealLogVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/dao/ApiTmGoodsDetailLogDao.java

@@ -1,7 +1,7 @@
 package com.platform.dao;
 
-import com.platform.entity.ApiTmGoodsDetailLogVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.ApiTmGoodsDetailLogVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/dao/ApiTmLiveRoomInfoDao.java

@@ -1,7 +1,7 @@
 package com.platform.dao;
 
-import com.platform.entity.ApiTmLiveRoomInfoVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.ApiTmLiveRoomInfoVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/dao/ApiTmSceneCensusDao.java

@@ -1,7 +1,7 @@
 package com.platform.dao;
 
-import com.platform.entity.ApiTmSceneCensusVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.ApiTmSceneCensusVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/dao/ApiTmSlideShowDao.java

@@ -1,7 +1,7 @@
 package com.platform.dao;
 
-import com.platform.entity.ApiTmSlideShowVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.ApiTmSlideShowVo;
 
 /**
  * <p>

+ 0 - 1
platform-api/src/main/java/com/platform/dao/ApiUserMapper.java

@@ -2,7 +2,6 @@ package com.platform.dao;
 
 import com.platform.entity.SmsLogVo;
 import com.platform.entity.UserVo;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/AdPositionVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 3 - 2
platform-api/src/main/java/com/platform/entity/ApiTmBrandAdminVo.java

@@ -1,14 +1,15 @@
 package com.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 店铺管理员关联关系表

+ 3 - 2
platform-api/src/main/java/com/platform/entity/ApiTmBrandTypeVo.java

@@ -1,14 +1,15 @@
 package com.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 

+ 4 - 3
platform-api/src/main/java/com/platform/entity/ApiTmDealLogVo.java

@@ -1,15 +1,16 @@
 package com.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 订单成交记录表

+ 4 - 3
platform-api/src/main/java/com/platform/entity/ApiTmGoodsDetailLogVo.java

@@ -1,15 +1,16 @@
 package com.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 商品详情浏览记录

+ 4 - 3
platform-api/src/main/java/com/platform/entity/ApiTmLiveRoomInfoVo.java

@@ -1,15 +1,16 @@
 package com.platform.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 直播间信息表

+ 4 - 3
platform-api/src/main/java/com/platform/entity/ApiTmSceneCensusVo.java

@@ -1,15 +1,16 @@
 package com.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 场景统计

+ 3 - 2
platform-api/src/main/java/com/platform/entity/ApiTmSlideShowVo.java

@@ -1,14 +1,15 @@
 package com.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 轮播图信息表

+ 0 - 1
platform-api/src/main/java/com/platform/entity/AttributeCategoryVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/AttributeVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/BrandVo.java

@@ -2,7 +2,6 @@ package com.platform.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/CartVo.java

@@ -2,7 +2,6 @@ package com.platform.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/ChannelVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/CollectVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/CommentPictureVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/GoodsAttributeVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/GoodsGalleryVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/GoodsIssueVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 3
platform-api/src/main/java/com/platform/entity/GoodsSpecificationVo.java

@@ -1,9 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/KeywordsVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/OrderGoodsVo.java

@@ -2,7 +2,6 @@ package com.platform.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/ProductVo.java

@@ -2,7 +2,6 @@ package com.platform.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/RelatedGoodsVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/SearchHistoryVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/SmsLogVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/SpecificationVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/TopicCategoryVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/TopicVo.java

@@ -2,7 +2,6 @@ package com.platform.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/UserLevelVo.java

@@ -1,7 +1,6 @@
 package com.platform.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/entity/UserVo.java

@@ -6,7 +6,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 

+ 0 - 1
platform-api/src/main/java/com/platform/service/ApiCouponService.java

@@ -14,7 +14,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

+ 0 - 3
platform-api/src/main/java/com/platform/service/ApiGoodsService.java

@@ -3,9 +3,6 @@ package com.platform.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.platform.dao.ApiGoodsMapper;
 import com.platform.entity.GoodsVo;
-import org.apache.commons.lang.StringUtils;
-import org.apache.ibatis.annotations.Param;
-import org.omg.CORBA.PUBLIC_MEMBER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 9 - 20
platform-api/src/main/java/com/platform/service/ApiOrderService.java

@@ -1,37 +1,26 @@
 package com.platform.service;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.platform.cache.J2CacheUtils;
+import com.platform.dao.*;
 import com.platform.entity.*;
 import com.platform.enums.ResultCodeEnum;
 import com.platform.exception.CommonBaseException;
-
+import com.platform.util.CommonUtil;
 import com.platform.utils.RRException;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import com.alibaba.fastjson.JSONObject;
-import com.platform.cache.J2CacheUtils;
-import com.platform.dao.ApiAddressMapper;
-import com.platform.dao.ApiCartMapper;
-import com.platform.dao.ApiCouponMapper;
-import com.platform.dao.ApiOrderGoodsMapper;
-import com.platform.dao.ApiOrderMapper;
-import com.platform.util.CommonUtil;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.*;
+
 
 @Service
 @Slf4j

+ 0 - 1
platform-api/src/main/java/com/platform/service/ApiRecommendService.java

@@ -1,7 +1,6 @@
 package com.platform.service;
 
 import com.platform.dao.ApiRecommendMapper;
-import com.platform.entity.AdVo;
 import com.platform.entity.RecommendEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
platform-api/src/main/java/com/platform/service/ApiTmBrandAdminService.java

@@ -1,7 +1,7 @@
 package com.platform.service;
 
-import com.platform.entity.ApiTmBrandAdminVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.ApiTmBrandAdminVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/service/ApiTmBrandTypeService.java

@@ -1,7 +1,7 @@
 package com.platform.service;
 
-import com.platform.entity.ApiTmBrandTypeVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.ApiTmBrandTypeVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/service/ApiTmDealLogService.java

@@ -1,7 +1,7 @@
 package com.platform.service;
 
-import com.platform.entity.ApiTmDealLogVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.ApiTmDealLogVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/service/ApiTmGoodsDetailLogService.java

@@ -1,7 +1,7 @@
 package com.platform.service;
 
-import com.platform.entity.ApiTmGoodsDetailLogVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.ApiTmGoodsDetailLogVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/service/ApiTmLiveRoomInfoService.java

@@ -1,7 +1,7 @@
 package com.platform.service;
 
-import com.platform.entity.ApiTmLiveRoomInfoVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.ApiTmLiveRoomInfoVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/service/ApiTmSceneCensusService.java

@@ -1,7 +1,7 @@
 package com.platform.service;
 
-import com.platform.entity.ApiTmSceneCensusVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.ApiTmSceneCensusVo;
 
 /**
  * <p>

+ 1 - 1
platform-api/src/main/java/com/platform/service/ApiTmSlideShowService.java

@@ -1,7 +1,7 @@
 package com.platform.service;
 
-import com.platform.entity.ApiTmSlideShowVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.ApiTmSlideShowVo;
 
 /**
  * <p>

+ 0 - 6
platform-api/src/main/java/com/platform/service/ApiUserCouponService.java

@@ -1,16 +1,10 @@
 package com.platform.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.platform.dao.ApiUserCouponMapper;
 import com.platform.entity.UserCouponVo;
-import com.platform.enums.ResultCodeEnum;
-import com.platform.exception.CommonBaseException;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

+ 0 - 2
platform-api/src/main/java/com/platform/service/SceneProService.java

@@ -1,10 +1,8 @@
 package com.platform.service;
 
 import com.fdage.micro.commom.respone.PageUtilsPlus;
-import com.github.pagehelper.PageInfo;
 import com.platform.entity.TbScenePro;
 import com.platform.vos.RequestScene;
-import com.platform.vos.ResponseScene;
 
 import java.util.List;
 

+ 0 - 1
platform-api/src/main/java/com/platform/service/UserService.java

@@ -1,7 +1,6 @@
 package com.platform.service;
 
 import com.platform.entity.TbUser;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 

+ 0 - 7
platform-api/src/main/java/com/platform/service/custom/MyApiTmBrandAdminService.java

@@ -1,24 +1,17 @@
 package com.platform.service.custom;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.platform.entity.ApiTmBrandAdminVo;
 import com.platform.entity.BrandVo;
-import com.platform.enums.IdStarterEnum;
 import com.platform.service.ApiBrandService;
-import com.platform.service.ApiUserService;
 import com.platform.service.impl.ApiTmBrandAdminServiceImpl;
-import com.platform.utils.UUidGenerator;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

+ 1 - 0
platform-api/src/main/java/com/platform/service/custom/MyApiTmSlideShowService.java

@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
 import java.util.List;
 
 /**

+ 0 - 1
platform-api/src/main/java/com/platform/service/custom/MyGoodsDetailLogService.java

@@ -7,7 +7,6 @@ import com.platform.utils.UUidGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**

+ 2 - 2
platform-api/src/main/java/com/platform/service/impl/ApiTmBrandAdminServiceImpl.java

@@ -1,9 +1,9 @@
 package com.platform.service.impl;
 
-import com.platform.entity.ApiTmBrandAdminVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.dao.ApiTmBrandAdminDao;
+import com.platform.entity.ApiTmBrandAdminVo;
 import com.platform.service.ApiTmBrandAdminService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 2 - 2
platform-api/src/main/java/com/platform/service/impl/ApiTmBrandTypeServiceImpl.java

@@ -1,9 +1,9 @@
 package com.platform.service.impl;
 
-import com.platform.entity.ApiTmBrandTypeVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.dao.ApiTmBrandTypeDao;
+import com.platform.entity.ApiTmBrandTypeVo;
 import com.platform.service.ApiTmBrandTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 2 - 2
platform-api/src/main/java/com/platform/service/impl/ApiTmDealLogServiceImpl.java

@@ -1,9 +1,9 @@
 package com.platform.service.impl;
 
-import com.platform.entity.ApiTmDealLogVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.dao.ApiTmDealLogDao;
+import com.platform.entity.ApiTmDealLogVo;
 import com.platform.service.ApiTmDealLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 2 - 2
platform-api/src/main/java/com/platform/service/impl/ApiTmGoodsDetailLogServiceImpl.java

@@ -1,9 +1,9 @@
 package com.platform.service.impl;
 
-import com.platform.entity.ApiTmGoodsDetailLogVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.dao.ApiTmGoodsDetailLogDao;
+import com.platform.entity.ApiTmGoodsDetailLogVo;
 import com.platform.service.ApiTmGoodsDetailLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 2 - 2
platform-api/src/main/java/com/platform/service/impl/ApiTmLiveRoomInfoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.platform.service.impl;
 
-import com.platform.entity.ApiTmLiveRoomInfoVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.dao.ApiTmLiveRoomInfoDao;
+import com.platform.entity.ApiTmLiveRoomInfoVo;
 import com.platform.service.ApiTmLiveRoomInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 2 - 2
platform-api/src/main/java/com/platform/service/impl/ApiTmSceneCensusServiceImpl.java

@@ -1,9 +1,9 @@
 package com.platform.service.impl;
 
-import com.platform.entity.ApiTmSceneCensusVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.dao.ApiTmSceneCensusDao;
+import com.platform.entity.ApiTmSceneCensusVo;
 import com.platform.service.ApiTmSceneCensusService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 2 - 2
platform-api/src/main/java/com/platform/service/impl/ApiTmSlideShowServiceImpl.java

@@ -1,9 +1,9 @@
 package com.platform.service.impl;
 
-import com.platform.entity.ApiTmSlideShowVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.dao.ApiTmSlideShowDao;
+import com.platform.entity.ApiTmSlideShowVo;
 import com.platform.service.ApiTmSlideShowService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 1 - 22
platform-api/src/main/java/com/platform/service/impl/SceneProServiceImpl.java

@@ -1,37 +1,16 @@
 package com.platform.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.fdage.micro.commom.constant.CONSTANTFILENAME;
-import com.fdage.micro.commom.constant.CONSTANTFILEPATH;
-import com.fdage.micro.commom.constant.CONSTANTURL;
-import com.fdage.micro.commom.dto.Result;
-import com.fdage.micro.commom.exception.BaseRuntimeException;
-import com.fdage.micro.commom.exception.FdkkRuntimeException;
 import com.fdage.micro.commom.respone.PageUtilsPlus;
-import com.fdage.micro.commom.util.*;
-import com.github.pagehelper.util.StringUtil;
 import com.platform.dao.TbSceneProMapper;
 import com.platform.entity.TbScenePro;
 import com.platform.service.SceneProService;
 import com.platform.vos.RequestScene;
-import net.coobird.thumbnailator.Thumbnails;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
+import java.util.List;
 
 /**
  * Created by Hb_zzZ on 2018/11/29.

+ 10 - 12
platform-api/src/main/java/com/platform/util/CommonUtil.java

@@ -1,5 +1,15 @@
 package com.platform.util;
 
+import com.alibaba.fastjson.JSONObject;
+import com.platform.utils.CharUtil;
+import com.platform.utils.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -10,18 +20,6 @@ import java.security.MessageDigest;
 import java.util.Calendar;
 import java.util.Date;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-import com.alibaba.fastjson.JSONObject;
-import com.platform.utils.CharUtil;
-import com.platform.utils.DateUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.client.RestTemplate;
-
 public class CommonUtil {
     private static Logger log = LoggerFactory.getLogger(CommonUtil.class);
 

+ 1 - 1
platform-api/src/main/java/com/platform/util/MyX509TrustManager.java

@@ -1,8 +1,8 @@
 package com.platform.util;
 
+import javax.net.ssl.X509TrustManager;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import javax.net.ssl.X509TrustManager;
 
 public class MyX509TrustManager implements X509TrustManager {
 

+ 4 - 4
platform-api/src/main/java/com/platform/util/OrderDealLogUtils.java

@@ -1,12 +1,12 @@
 package com.platform.util;
 
-import com.platform.entity.*;
-import com.platform.service.ApiTmDealLogService;
+import com.platform.entity.ApiTmDealLogVo;
+import com.platform.entity.BrandVo;
+import com.platform.entity.OrderVo;
+import com.platform.entity.UserVo;
 import com.platform.service.custom.MyApiDealLogService;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cglib.core.Local;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;

+ 1 - 5
platform-api/src/main/java/com/platform/util/wechat/WechatUtil.java

@@ -29,11 +29,7 @@ import java.math.BigDecimal;
 import java.math.MathContext;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * <p>Title: 微信退款工具类</p>

+ 34 - 0
platform-common/pom.xml

@@ -22,6 +22,40 @@
         <groupId>com.fdage.micro</groupId>
         <artifactId>unite-account-commom</artifactId>
         <version>0.0.1-SNAPSHOT</version>
+        <exclusions>
+            <exclusion>
+                <artifactId>alipay-sdk-java</artifactId>
+                <groupId>com.alipay.sdk</groupId>
+            </exclusion>
+            <exclusion>
+                <artifactId>aliyun-java-sdk-cms</artifactId>
+                <groupId>com.aliyun</groupId>
+            </exclusion>
+            <exclusion>
+                <artifactId>*</artifactId>
+                <groupId>com.amazonaws</groupId>
+            </exclusion>
+            <exclusion>
+                <artifactId>spring-boot-starter-amqp</artifactId>
+                <groupId>org.springframework.boot</groupId>
+            </exclusion>
+            <exclusion>
+                <artifactId>xstream</artifactId>
+                <groupId>com.thoughtworks.xstream</groupId>
+            </exclusion>
+            <exclusion>
+                <artifactId>javacpp</artifactId>
+                <groupId>org.bytedeco</groupId>
+            </exclusion>
+            <exclusion>
+                <artifactId>javacpp</artifactId>
+                <groupId>org.bytedeco</groupId>
+            </exclusion>
+            <exclusion>
+                <artifactId>javacv-platform</artifactId>
+                <groupId>org.bytedeco</groupId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
         <groupId>commons-httpclient</groupId>

+ 0 - 2
platform-common/src/main/java/com/platform/cache/J2CacheUtils.java

@@ -1,7 +1,5 @@
 package com.platform.cache;
 
-import com.platform.utils.Constant;
-import com.platform.utils.StringUtils;
 import net.oschina.j2cache.CacheChannel;
 import net.oschina.j2cache.J2Cache;
 

+ 0 - 1
platform-common/src/main/java/com/platform/config/SwaggerConfig.java

@@ -3,7 +3,6 @@ package com.platform.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;

+ 1 - 1
platform-common/src/main/java/com/platform/dao/SysUserBrandDao.java

@@ -1,7 +1,7 @@
 package com.platform.dao;
 
-import com.platform.entity.SysUserBrand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.SysUserBrand;
 
 /**
  * <p>

+ 1 - 2
platform-common/src/main/java/com/platform/dao/custom/MySysUserBrandDao.java

@@ -1,11 +1,10 @@
 package com.platform.dao.custom;
 
-import com.platform.entity.SysUserBrand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.platform.entity.SysUserBrand;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

+ 0 - 1
platform-common/src/main/java/com/platform/entity/SysSmsLogEntity.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 

+ 3 - 3
platform-common/src/main/java/com/platform/entity/SysUserBrand.java

@@ -1,8 +1,5 @@
 package com.platform.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 系统用户与品牌绑定关系表

+ 0 - 1
platform-common/src/main/java/com/platform/entity/WxLiveRoomRequestVo.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * @author abnerhou

+ 7 - 10
platform-common/src/main/java/com/platform/oss/QcloudCloudStorageService.java

@@ -1,15 +1,5 @@
 package com.platform.oss;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.channels.FileChannel;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.apache.http.entity.ContentType;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.platform.utils.RRException;
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.ClientConfig;
@@ -23,6 +13,13 @@ import com.qcloud.cos.model.UploadResult;
 import com.qcloud.cos.region.Region;
 import com.qcloud.cos.transfer.TransferManager;
 import com.qcloud.cos.transfer.Upload;
+import org.apache.http.entity.ContentType;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 腾讯云存储

+ 1 - 1
platform-common/src/main/java/com/platform/oss/QiniuCloudStorageService.java

@@ -1,11 +1,11 @@
 package com.platform.oss;
 
+import com.platform.utils.RRException;
 import com.qiniu.common.Zone;
 import com.qiniu.http.Response;
 import com.qiniu.storage.Configuration;
 import com.qiniu.storage.UploadManager;
 import com.qiniu.util.Auth;
-import com.platform.utils.RRException;
 import org.apache.commons.io.IOUtils;
 import org.springframework.web.multipart.MultipartFile;
 

+ 2 - 10
platform-common/src/main/java/com/platform/page/PageHelper.java

@@ -5,21 +5,13 @@ import org.apache.ibatis.executor.resultset.ResultSetHandler;
 import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.plugin.Intercepts;
-import org.apache.ibatis.plugin.Invocation;
-import org.apache.ibatis.plugin.Plugin;
-import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.plugin.*;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 import org.apache.log4j.Logger;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 import java.util.List;
 import java.util.Properties;
 

+ 1 - 1
platform-common/src/main/java/com/platform/service/ISysUserBrandService.java

@@ -1,7 +1,7 @@
 package com.platform.service;
 
-import com.platform.entity.SysUserBrand;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.platform.entity.SysUserBrand;
 
 /**
  * <p>

+ 3 - 6
platform-common/src/main/java/com/platform/service/custom/MySysUserBrandService.java

@@ -2,24 +2,21 @@ package com.platform.service.custom;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.platform.dao.SysUserBrandDao;
 import com.platform.dao.custom.MySysUserBrandDao;
 import com.platform.entity.SysUserBrand;
 import com.platform.enums.IdStarterEnum;
-import com.platform.service.SysUserBrandService;
 import com.platform.service.impl.SysUserBrandServiceImpl;
-
 import com.platform.utils.UUidGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 2 * @Author: Abner

+ 2 - 2
platform-common/src/main/java/com/platform/service/impl/SysUserBrandServiceImpl.java

@@ -1,9 +1,9 @@
 package com.platform.service.impl;
 
-import com.platform.entity.SysUserBrand;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.dao.SysUserBrandDao;
+import com.platform.entity.SysUserBrand;
 import com.platform.service.ISysUserBrandService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

+ 4 - 1
platform-common/src/main/java/com/platform/utils/CommonDataUtils.java

@@ -1,4 +1,5 @@
 package com.platform.utils;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.platform.enums.ResultCodeEnum;
@@ -8,7 +9,9 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author abnerhou

+ 0 - 506
platform-common/src/main/java/com/platform/utils/FileUtils.java

@@ -1,23 +1,8 @@
 package com.platform.utils;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.bytedeco.javacpp.opencv_core;
-import org.bytedeco.javacv.FFmpegFrameGrabber;
-import org.bytedeco.javacv.Frame;
-import org.bytedeco.javacv.Java2DFrameConverter;
-import org.bytedeco.javacv.OpenCVFrameConverter;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Decoder;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
 import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.*;
 
 @Slf4j
 public class FileUtils {
@@ -25,26 +10,6 @@ public class FileUtils {
     //文件路径+名称
     private static String fileNameTemp;
 
-    public static void uploadImg(String path, String base64Data)
-            throws Exception {
-        byte[] bt = null;
-        try {
-            BASE64Decoder decoder = new BASE64Decoder();
-            if (base64Data.startsWith("data:image/png;base64,")) {
-                bt = decoder.decodeBuffer(base64Data.replace("data:image/png;base64,", ""));
-            } else if (base64Data.startsWith("data:image/jpeg;base64,")) {
-                bt = decoder.decodeBuffer(base64Data.replace("data:image/jpeg;base64,", ""));
-            } else if (base64Data.startsWith("data:image/bmp;base64,")) {
-                bt = decoder.decodeBuffer(base64Data.replace("data:image/bmp;base64,", ""));
-            } else {
-                return;
-            }
-            writeBinary(bt, path);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
     private static void writeBinary(byte[] buf, String filePath) throws Exception {
         File fout = new File(filePath);
         if (!fout.getParentFile().exists()) {
@@ -82,100 +47,6 @@ public class FileUtils {
     }
 
     /**
-     * 获取视频的第一帧
-     * */
-    public static boolean executeCodecs(String filePath, String targetFilePath, String targetFileName ,String imageMat){
-        try {
-            FFmpegFrameGrabber ff = FFmpegFrameGrabber.createDefault(filePath);
-            ff.start();
-            /**
-             * 如果拍摄的视频中带有旋转(rotate)信息,那么截取出来的图片就会被旋转
-             * getVideoMetadata("rotate")方法可以获取到视频的旋转信息。
-             * 根据获取到的rotate信息对ff.grabImage()得到的Frame进行旋转,
-             * 但是Frame并没有提供旋转接口。但有一个IpImage对象提供了旋转方法
-             */
-            String rotate = ff.getVideoMetadata("rotate");
-            Frame f;
-            int i = 0;
-            while (i < 1) {
-                f = ff.grabImage();
-                opencv_core.IplImage src = null;
-                if (null != rotate && rotate.length() > 1) {
-                    OpenCVFrameConverter.ToIplImage converter = new OpenCVFrameConverter.ToIplImage();
-                    src = converter.convert(f);
-                    f = converter.convert(rotate(src, Integer.valueOf(rotate)));
-                }
-                doExecuteFrame(f, targetFilePath, targetFileName ,imageMat);
-                i++;
-            }
-            ff.stop();
-            return true;
-        } catch (Exception e) {
-            log.info("生成视频第一帧图片出错:{}" ,e);
-        }
-        return false;
-    }
-
-    /*
-     * 旋转角度的
-     */
-    public static   opencv_core.IplImage rotate(opencv_core.IplImage src, int angle) {
-        opencv_core.IplImage img = opencv_core.IplImage.create(src.height(), src.width(), src.depth(), src.nChannels());
-        opencv_core.cvTranspose(src, img);
-        opencv_core.cvFlip(img, img, angle);
-        return img;
-    }
-
-    public static   void doExecuteFrame(Frame f, String targetFilePath, String targetFileName , String imageMat) {
-
-        if (null == f || null == f.image) {
-            return;
-        }
-        Java2DFrameConverter converter = new Java2DFrameConverter();
-        String fileName = targetFilePath + targetFileName + "." + imageMat;
-        BufferedImage bi = converter.getBufferedImage(f);
-        log.info("输出视频第一帧的图片的宽度:{},高度:{}" ,  bi.getWidth() , bi.getHeight());
-        File output = new File(fileName);
-        try {
-            ImageIO.write(bi, imageMat, output);
-        } catch (IOException e) {
-            log.info("生成视频第一帧图片出错:{}" ,e);
-        }
-    }
-
-
-    /**
-     * 创建文件
-     *
-     * @param fileName    文件名称
-     * @param fileContent 文件内容
-     * @return 是否创建成功,成功则返回true
-     */
-    public static boolean createFile(String path, String fileName, String fileContent) {
-        Boolean bool = false;
-        fileNameTemp = path + fileName + ".json";//文件路径+名称+文件类型
-        File file = new File(fileNameTemp);
-        try {
-            File folder = new File(path);
-            if (!folder.exists()) {
-                folder.mkdirs();
-            }
-            //如果文件不存在,则创建新的文件
-            if (!file.exists()) {
-                file.createNewFile();
-                bool = true;
-                System.out.println("success create file,the file is " + fileNameTemp);
-                //创建文件成功后,写入内容到文件里
-                writeFileContent(fileNameTemp, fileContent);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return bool;
-    }
-
-    /**
      * 向文件中写入内容
      *
      * @param filePath 文件路径与名称
@@ -237,65 +108,6 @@ public class FileUtils {
         }
         return bool;
     }
-    public static String parseFile(MultipartFile multipartFile , String fileBackupPath , String newFileName) {
-        File directory = new File(fileBackupPath);
-        if (!directory.exists()) {
-            directory.mkdirs();
-        }
-        String fileName = fileBackupPath.concat(newFileName);
-        log.info("上传的文件名:{}", fileName);
-        File file = new File(fileName);
-        if(file.exists()){
-            deleteFile(fileName);
-            file = new File(fileName);
-        }
-        try {
-            InputStream is = multipartFile.getInputStream();
-            FileOutputStream os = new FileOutputStream(file);
-            byte[] b = new byte[2048];
-            int length;
-            while ((length = is.read(b)) > 0) {
-                os.write(b, 0, length);
-            }
-            is.close();
-            os.close();
-        } catch (IOException e) {
-            log.info("文件存储本地出现异常:{}", e);
-        }
-        return fileName;
-    }
-
-    public static String parseFile(MultipartFile multipartFile , String fileBackupPath) {
-        File directory = new File(fileBackupPath);
-        if (!directory.exists()) {
-            directory.mkdirs();
-        }
-        String fileName = fileBackupPath.concat(multipartFile.getOriginalFilename());
-        log.info("上传的文件名:{}", fileName);
-        File file = new File(fileName);
-        if(file.exists()){
-            deleteFile(fileName);
-            file = new File(fileName);
-        }
-        try {
-            InputStream is = multipartFile.getInputStream();
-            FileOutputStream os = new FileOutputStream(file);
-            byte[] b = new byte[2048];
-            int length;
-            while ((length = is.read(b)) > 0) {
-                os.write(b, 0, length);
-            }
-            is.close();
-            os.close();
-        } catch (IOException e) {
-            log.info("文件存储本地出现异常:{}", e);
-        }
-        return fileName;
-    }
-
-
-
-
 
     /**
      * 删除单个文件
@@ -317,28 +129,6 @@ public class FileUtils {
     }
 
     /**
-     * 根据路径删除指定的目录,无论存在与否
-     *
-     * @param sPath 要删除的目录path
-     * @return 删除成功返回 true,否则返回 false。
-     */
-    public static boolean deleteFolder(String sPath) {
-        boolean flag = false;
-        File file = new File(sPath);
-        // 判断目录或文件是否存在
-        if (!file.exists()) {  // 不存在返回 false
-            return flag;
-        } else {
-            // 判断是否为文件
-            if (file.isFile()) {  // 为文件时调用删除文件方法
-                return deleteFile(sPath);
-            } else {  // 为目录时调用删除目录方法
-                return deleteDirectory(sPath);
-            }
-        }
-    }
-
-    /**
      * 删除目录以及目录下的文件
      *
      * @param sPath 被删除目录的路径
@@ -414,128 +204,6 @@ public class FileUtils {
         }
     }
 
-    public static boolean copyFile(String srcFileName, String destFileName, boolean overlay) {
-        File srcFile = new File(srcFileName);
-        // 判断源文件是否存在
-        if (!srcFile.exists()) {
-            return false;
-        } else if (!srcFile.isFile()) {
-            return false;
-        }
-        // 判断目标文件是否存在
-        File destFile = new File(destFileName);
-        if (destFile.exists()) {
-            // 如果目标文件存在并允许覆盖
-            if (overlay) {
-                // 删除已经存在的目标文件,无论目标文件是目录还是单个文件
-                new File(destFileName).delete();
-            }
-        } else {
-            // 如果目标文件所在目录不存在,则创建目录
-            if (!destFile.getParentFile().exists()) {
-                // 目标文件所在目录不存在
-                if (!destFile.getParentFile().mkdirs()) {
-                    // 复制文件失败:创建目标文件所在目录失败
-                    return false;
-                }
-            }
-        }
-        // 复制文件
-        int byteread = 0; // 读取的字节数
-        InputStream in = null;
-        OutputStream out = null;
-        try {
-            in = new FileInputStream(srcFile);
-            out = new FileOutputStream(destFile);
-            byte[] buffer = new byte[1024];
-
-            while ((byteread = in.read(buffer)) != -1) {
-                out.write(buffer, 0, byteread);
-            }
-            return true;
-        } catch (IOException e) {
-            return false;
-        } finally {
-            try {
-                if (out != null) {
-                    out.close();
-                }
-                if (in != null) {
-                    in.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * 从网络Url中下载文件
-     *
-     * @param urlStr
-     * @param fileName
-     * @param savePath
-     * @return
-     * @throws IOException
-     */
-    public static boolean downLoadFromUrl(String urlStr, String fileName, String savePath) {
-        FileOutputStream fos = null;
-        InputStream inputStream = null;
-        try {
-            URL url = new URL(urlStr);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            // 设置超时间为3秒
-            conn.setConnectTimeout(3 * 1000);
-            // 防止屏蔽程序抓取而返回403错误
-            conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
-
-            // 得到输入流
-            inputStream = conn.getInputStream();
-            // 获取自己数组
-            byte[] getData = readInputStream(inputStream);
-
-            // 文件保存位置
-            File saveDir = new File(savePath);
-            if (!saveDir.exists()) {
-                saveDir.mkdirs();
-            }
-            String filePath = saveDir + File.separator + fileName;
-            String filePathFolder = filePath.substring(0, filePath.lastIndexOf("/") + 1);
-            createDir(filePathFolder);
-
-            File file = new File(filePath);
-            fos = new FileOutputStream(file);
-            fos.write(getData);
-            if (fos != null) {
-                fos.close();
-            }
-            if (inputStream != null) {
-                inputStream.close();
-            }
-            System.out.println("info:" + url + " download success");
-        } catch (FileNotFoundException e) {
-            return false;
-        } catch (IOException e) {
-            return false;
-        } finally {
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return true;
-    }
-
     /**
      * 从输入流中获取字节数组
      *
@@ -592,34 +260,6 @@ public class FileUtils {
         }
     }
 
-    /**
-     * 向json文件写入参数,重复的覆盖,多的新增
-     *
-     * @return
-     */
-    public static void writeJsonFile(String path, Map<String, Object> map) throws Exception {
-        String str = readFile(path);
-        JSONObject json = new JSONObject();
-        if (str != null) {
-            json = JSONObject.parseObject(str);
-        } else {
-            File file = new File(path);
-            if (!file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
-            }
-            if (!file.exists()) {
-                file.createNewFile();
-            }
-        }
-        Iterator entries = map.entrySet().iterator();
-        while (entries.hasNext()) {
-            Map.Entry entry = (Map.Entry) entries.next();
-            json.put(String.valueOf(entry.getKey()), entry.getValue());
-        }
-
-        writeFile(path, json.toString());
-    }
-
 
     //删除文件夹
     public static void delFolder(String folderPath) {
@@ -668,150 +308,4 @@ public class FileUtils {
         file.delete();
         return flag;
     }
-
-    public static List<String> readfileNamesForDirectory(String path, String except) {
-        try {
-            File file = new File(path);
-            if (file.isDirectory()) {
-                String[] fileNames = file.list();
-                List<String> list = new ArrayList<String>();
-                if (fileNames != null) {
-                    for (int i = 0; i < fileNames.length; ++i) {
-                        if (fileNames[i].toLowerCase().endsWith(except)) {
-                            list.add(fileNames[i]);
-                        }
-                    }
-                }
-
-                return list;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    //递归获取文件中所有文件的路径
-    public static List<String> readfilePath(String path, List<String> urlList) {
-        try {
-            File file = new File(path);
-            if (file != null && file.isDirectory()) {
-                File[] files = file.listFiles();
-
-                if (files != null) {
-                    for (int i = 0; i < files.length; ++i) {
-                        if (files[i].isDirectory()) {
-                            readfilePath(files[i].getAbsolutePath(), urlList);
-                        } else {
-                            urlList.add(files[i].getAbsolutePath());
-                        }
-                    }
-                }
-                return urlList;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return urlList;
-    }
-
-    public static void saveImageToDisk(String accessToken, String mediaId, String picName, String picPath, InputStream inputStream)
-            throws Exception {
-        byte[] data = new byte[10240];
-        int len = 0;
-        FileOutputStream fileOutputStream = null;
-        try {
-            fileOutputStream = new FileOutputStream(picPath + picName + ".amr");
-            while ((len = inputStream.read(data)) != -1) {
-                fileOutputStream.write(data, 0, len);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (fileOutputStream != null) {
-                try {
-                    fileOutputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    /**
-     * @param content base64内容
-     * @param path    输出文件路径,需要后缀名
-     * @return
-     */
-    public static boolean base64ToFileWriter(String content, String path) {
-        if (content == null) {
-            return false;
-        }
-        BASE64Decoder decoder = new BASE64Decoder();
-        try {
-            // decoder
-            byte[] b = decoder.decodeBuffer(content);
-            // processing data
-            for (int i = 0; i < b.length; ++i) {
-                if (b[i] < 0) {
-                    b[i] += 256;
-                }
-            }
-            OutputStream out = new FileOutputStream(path);
-            out.write(b);
-            out.flush();
-            out.close();
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * 获取类路径(classes路径)
-     */
-    public static String getResource() {
-        String path = "";
-        try {
-            path = ResourceUtils.getURL("classpath:").getPath();
-            path = URLDecoder.decode(path, "utf-8");
-        } catch (Exception e) {
-        }
-        return path;
-    }
-
-    /**
-     * 判断文件大小处于限制内
-     *
-     * @param fileLen  文件长度
-     * @param fileSize 限制大小
-     * @param fileUnit 限制的单位(B,K,M,G)
-     * @return
-     */
-    public static boolean checkFileSizeIsLimit(Long fileLen, double fileSize, String fileUnit) {
-//        long len = file.length();
-        double fileSizeCom = 0;
-        if ("B".equals(fileUnit.toUpperCase())) {
-            fileSizeCom = (double) fileLen;
-        } else if ("K".equals(fileUnit.toUpperCase())) {
-            fileSizeCom = (double) fileLen / 1024;
-        } else if ("M".equals(fileUnit.toUpperCase())) {
-            fileSizeCom = (double) fileLen / (1024 * 1024);
-        } else if ("G".equals(fileUnit.toUpperCase())) {
-            fileSizeCom = (double) fileLen / (1024 * 1024 * 1024);
-        }
-        if (fileSizeCom > fileSize) {
-            return false;
-        }
-        return true;
-
-    }
-
 }

+ 12 - 13
platform-common/src/main/java/com/platform/utils/HttpUtils.java

@@ -1,18 +1,5 @@
 package com.platform.utils;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -31,6 +18,18 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 public class HttpUtils {
 	
 	/**

+ 0 - 0
platform-common/src/main/java/com/platform/utils/JwtUtil.java


Some files were not shown because too many files changed in this diff