采用阿里代码规约，对代码进行优化

KBI73 · Jul 8, 2021 · 3e73257 · 3e73257
1 parent 9e240f2
commit 3e73257
Show file tree

Hide file tree

Showing 343 changed files with 2,627 additions and 1,477 deletions.
diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java
@@ -38,8 +38,8 @@ public class MemberWithdrawApplyBuyerController {
     public ResultMessage<IPage<MemberWithdrawApply>> getByPage(PageVO page, MemberWithdrawApplyQueryVO memberWithdrawApplyQueryVO) {
         memberWithdrawApplyQueryVO.setMemberId(UserContext.getCurrentUser().getId());
         //构建查询 返回数据
-        IPage<MemberWithdrawApply> memberWithdrawApplyIPage = memberWithdrawApplyService.getMemberWithdrawPage(page, memberWithdrawApplyQueryVO);
-        return ResultUtil.data(memberWithdrawApplyIPage);
+        IPage<MemberWithdrawApply> memberWithdrawApplyPage = memberWithdrawApplyService.getMemberWithdrawPage(page, memberWithdrawApplyQueryVO);
+        return ResultUtil.data(memberWithdrawApplyPage);
     }
 
 }
diff --git a/...-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java b/...-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java
@@ -40,7 +40,6 @@ public class DistributionBuyerController {
     @Autowired
     private DistributionOrderService distributionOrderService;
 
-    //申请分销员
     @ApiOperation(value = "申请分销员")
     @PostMapping
     public ResultMessage<Object> applyDistribution(DistributionApplyDTO distributionApplyDTO) {
@@ -63,7 +62,6 @@ public ResultMessage<Distribution> getDistribution() {
         return ResultUtil.data(distributionService.getDistribution());
     }
 
-    //申请分销员
     @ApiOperation(value = "绑定分销员")
     @ApiImplicitParam(name = "distributionId", value = "分销员ID", required = true, paramType = "path")
     @GetMapping("/bindingDistribution/{distributionId}")

diff --git a/common-api/src/main/java/cn/lili/controller/common/FileController.java b/common-api/src/main/java/cn/lili/controller/common/FileController.java
@@ -81,6 +81,7 @@ public ResultMessage<File> upload(@RequestHeader String accessToken, String id,
                 if (file.getUserEnums().equals(authUser.getRole().name())) {
                     break;
                 }
+            default:
                 throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
         }
         fileService.updateById(file);

diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
@@ -28,10 +28,9 @@ public class SliderImageController {
     @Autowired
     private VerificationService verificationService;
 
-    //一分钟同一个ip请求10次
     @LimitPoint(name = "slider_image", key = "verification")
     @GetMapping("/{verificationEnums}")
-    @ApiOperation(value = "获取校验接口")
+    @ApiOperation(value = "获取校验接口,一分钟同一个ip请求10次")
     public ResultMessage getSliderImage(@RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) {
         try {
             return ResultUtil.data(verificationService.createVerification(verificationEnums, uuid));

diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java
@@ -31,14 +31,13 @@ public class SmsController {
     @Autowired
     private VerificationService verificationService;
 
-    //一分钟同一个ip请求1次
     @LimitPoint(name = "sms_send", key = "sms")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataType = "String", name = "mobile", value = "手机号"),
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "uuid", value = "uuid"),
     })
     @GetMapping("/{verificationEnums}/{mobile}")
-    @ApiOperation(value = "发送短信验证码")
+    @ApiOperation(value = "发送短信验证码,一分钟同一个ip请求1次")
     public ResultMessage getSmsCode(
             @RequestHeader String uuid,
             @PathVariable String mobile,

diff --git a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java
@@ -12,6 +12,7 @@
 import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
 import cn.lili.timetask.handler.EveryDayExecute;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,13 +24,18 @@
  * @author Chopper
  * @date 2020-07-03 11:20
  */
+@Slf4j
 @Service
 public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDayExecute, AfterSaleStatusChangeEvent {
 
-    //分销订单
+    /**
+     * 分销订单
+     */
     @Autowired
     private DistributionOrderService distributionOrderService;
-    //分销订单持久层
+    /**
+     * 分销订单持久层
+     */
     @Resource
     private DistributionOrderMapper distributionOrderMapper;
 
@@ -48,6 +54,9 @@ public void orderChange(OrderMessage orderMessage) {
                 distributionOrderService.cancelOrder(orderMessage.getOrderSn());
                 break;
             }
+            default:
+                log.error("分销订单执行异常：", orderMessage.getOrderSn());
+                break;
         }
     }
 

diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
@@ -44,7 +44,7 @@ public void orderCreate(TradeDTO tradeDTO) {
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         noticeMessageDTO.setMemberId(tradeDTO.getMemberId());
         noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.ORDER_CREATE_SUCCESS);
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>(2);
         params.put("goods", tradeDTO.getSkuList().get(0).getGoodsSku().getGoodsName());
         noticeMessageDTO.setParameter(params);
         //保存站内信
@@ -58,7 +58,7 @@ public void orderChange(OrderMessage orderMessage) {
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         //如果订单状态不为空
         if (orderDetailVO != null) {
-            Map<String, String> params = new HashMap<>();
+            Map<String, String> params = new HashMap<>(2);
             switch (orderMessage.getNewStatus()) {
                 //如果订单新的状态为已取消 则发送取消订单站内信
                 case CANCELLED:
@@ -103,7 +103,7 @@ public void orderChange(OrderMessage orderMessage) {
     public void afterSaleStatusChange(AfterSale afterSale) {
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         noticeMessageDTO.setMemberId(afterSale.getMemberId());
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>(2);
         params.put("goods", afterSale.getGoodsName());
         params.put("refuse", afterSale.getAuditRemark());
         noticeMessageDTO.setParameter(params);
@@ -154,7 +154,7 @@ public void memberPointChange(MemberPointMessage memberPointMessage) {
         //组织站内信参数
         NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
         noticeMessageDTO.setMemberId(memberPointMessage.getMemberId());
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>(2);
         if (memberPointMessage.getType()) {
             params.put("expenditure_points", "0");
             params.put("income_points", memberPointMessage.getPoint().toString());
@@ -178,7 +178,7 @@ public void memberWithdrawal(MemberWithdrawalMessage memberWithdrawalMessage) {
             //组织参数
             NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
             noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
-            Map<String, String> params = new HashMap<>();
+            Map<String, String> params = new HashMap<>(2);
             params.put("income", memberWithdrawalMessage.getPrice().toString());
             noticeMessageDTO.setParameter(params);
             noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS);

diff --git a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
@@ -10,6 +10,7 @@
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.kit.Payment;
 import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
  * @author Chopper
  * @date 2021-03-13 16:58
  */
+@Slf4j
 @Service
 public class PaymentExecute implements OrderStatusChangeEvent {
 
@@ -64,6 +66,9 @@ public void orderChange(OrderMessage orderMessage) {
                         break;
                     case BANK_TRANSFER:
                         break;
+                    default:
+                        log.error("订单支付执行异常,订单编号：", orderMessage.getOrderSn());
+                        break;
                 }
                 break;
             default:

diff --git a/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java b/consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
@@ -24,7 +24,9 @@
 @RocketMQMessageListener(topic = "${lili.data.rocketmq.after-sale-topic}", consumerGroup = "${lili.data.rocketmq.after-sale-group}")
 public class AfterSaleMessageListener implements RocketMQListener<MessageExt> {
 
-    //售后订单状态
+    /**
+     * 售后订单状态
+     */
     @Autowired
     private List<AfterSaleStatusChangeEvent> afterSaleStatusChangeEvents;
 
@@ -43,6 +45,8 @@ public void onMessage(MessageExt messageExt) {
                                 e);
                     }
                 }
+            default:
+                log.error("售后状态修改事件执行异常：", new String(messageExt.getBody()));
                 break;
         }
 

diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java
@@ -20,7 +20,6 @@
 import cn.lili.modules.search.service.EsGoodsIndexService;
 import cn.lili.modules.store.service.StoreService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.common.message.MessageExt;
@@ -123,6 +122,9 @@ public void onMessage(MessageExt messageExt) {
             case BUY_GOODS_COMPLETE:
                 this.goodsBuyComplete(messageExt);
                 break;
+            default:
+                log.error("商品执行异常：", new String(messageExt.getBody()));
+                break;
         }
     }
 

diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java
@@ -21,10 +21,14 @@
 @Component
 public class BillExecute implements EveryDayExecute {
 
-    //结算单
+    /**
+     * 结算单
+     */
     @Autowired
     private BillService billService;
-    //店铺详情
+    /**
+     * 店铺详情
+     */
     @Resource
     private StoreDetailMapper storeDetailMapper;
 

diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java
@@ -8,9 +8,9 @@
 import cn.lili.modules.member.mapper.MemberEvaluationMapper;
 import cn.lili.timetask.handler.EveryDayExecute;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -22,11 +22,15 @@
  */
 @Component
 public class GoodsExecute implements EveryDayExecute {
-    //会员评价
-    @Autowired
+    /**
+     * 会员评价
+     */
+    @Resource
     private MemberEvaluationMapper memberEvaluationMapper;
-    //商品
-    @Autowired
+    /**
+     * 商品
+     */
+    @Resource
     private GoodsMapper goodsMapper;
 
     /**

diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java
@@ -12,7 +12,6 @@
 import cn.lili.modules.system.service.SettingService;
 import cn.lili.timetask.handler.EveryMinuteExecute;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,12 +27,15 @@
  **/
 @Slf4j
 @Component
-
 public class CancelOrderTaskExecute implements EveryMinuteExecute {
-    //订单
+    /**
+     * 订单
+     */
     @Autowired
     private OrderService orderService;
-    //设置
+    /**
+     * 设置
+     */
     @Autowired
     private SettingService settingService;
 

diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java
@@ -11,10 +11,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -29,7 +29,7 @@ public class StoreRatingExecute implements EveryDayExecute {
     @Autowired
     private StoreService storeService;
     //会员评价
-    @Autowired
+    @Resource
     private MemberEvaluationMapper memberEvaluationMapper;
 
 
@@ -39,10 +39,10 @@ public void execute() {
         List<Store> storeList = storeService.list(new LambdaQueryWrapper<Store>().eq(Store::getStoreDisable, StoreStatusEnum.OPEN.name()));
         for (Store store : storeList) {
             //店铺所有开启的评价
-            LambdaQueryWrapper<MemberEvaluation> QueryWrapper = Wrappers.lambdaQuery();
-            QueryWrapper.eq(MemberEvaluation::getStoreId, store.getId());
-            QueryWrapper.eq(MemberEvaluation::getStatus, SwitchEnum.OPEN.name());
-            StoreRatingVO storeRatingVO = memberEvaluationMapper.getStoreRatingVO(QueryWrapper);
+            LambdaQueryWrapper<MemberEvaluation> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            lambdaQueryWrapper.eq(MemberEvaluation::getStoreId, store.getId());
+            lambdaQueryWrapper.eq(MemberEvaluation::getStatus, SwitchEnum.OPEN.name());
+            StoreRatingVO storeRatingVO = memberEvaluationMapper.getStoreRatingVO(lambdaQueryWrapper);
 
             if (storeRatingVO != null) {
                 //保存评分

diff --git a/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java b/consumer/src/main/java/cn/lili/trigger/AbstractDelayQueueListen.java
@@ -79,6 +79,7 @@ private void startDelayQueueMachine() {
 
     /**
      * 要实现延时队列的名字
+     * @return 促销延时队列名称
      */
     public abstract String setDelayQueueName();
 
@@ -88,7 +89,7 @@ private void startDelayQueueMachine() {
      */
     @PostConstruct
     public void init() {
-        new Thread(this::startDelayQueueMachine).start();
+        ThreadPoolUtil.getPool().execute(this::startDelayQueueMachine);
     }
 
 }
diff --git a/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java b/framework/src/main/java/cn/lili/common/aop/limiter/LimitInterceptor.java
@@ -75,10 +75,15 @@ public void interceptor(LimitPoint limitPointAnnotation) {
     }
 
 
-    //默认unknown常量值
+    /**
+     * 默认unknown常量值
+     */
     private static final String UNKNOWN = "unknown";
 
-    //获取ip
+    /**
+     * 获取ip
+     * @return ip
+     */
     public String getIpAddress() {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String ip = request.getHeader("x-forwarded-for");

diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java
@@ -39,7 +39,7 @@ public class SystemLogAspect {
     /**
      * 启动线程异步记录日志
      */
-    private static final ThreadLocal<Date> beginTimeThreadLocal = new NamedThreadLocal<>("SYSTEM-LOG");
+    private static final ThreadLocal<Date> BEGIN_TIME_THREAD_LOCAL = new NamedThreadLocal<>("SYSTEM-LOG");
 
     @Autowired
     private SystemLogService systemLogService;
@@ -61,7 +61,7 @@ public void controllerAspect() {
      */
     @Before("controllerAspect()")
     public void doBefore() {
-        beginTimeThreadLocal.set(new Date());
+        BEGIN_TIME_THREAD_LOCAL.set(new Date());
     }
 
 
@@ -110,7 +110,7 @@ public void after(JoinPoint joinPoint, Object rvt) {
             //写入自定义日志内容
             systemLogVO.setCustomerLog(customerLog);
             //请求开始时间
-            long beginTime = beginTimeThreadLocal.get().getTime();
+            long beginTime = BEGIN_TIME_THREAD_LOCAL.get().getTime();
             long endTime = System.currentTimeMillis();
             //请求耗时
             Long usedTime = endTime - beginTime;
@@ -157,7 +157,7 @@ public void run() {
      */
     private static Map<String, String> spelFormat(JoinPoint joinPoint, Object rvt) {
 
-        Map<String, String> result = new HashMap<>();
+        Map<String, String> result = new HashMap<>(2);
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         SystemLogPoint systemLogPoint = signature.getMethod().getAnnotation(SystemLogPoint.class);
         String description = systemLogPoint.description();