From 40d7454008f328338278892c3a99a5308f4f84f9 Mon Sep 17 00:00:00 2001 From: wuxicheng <1441859745@qq.com> Date: Wed, 24 May 2023 11:33:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bnyer/order/aop/LimitRepeatRequestAspect.java | 5 +++-- .../java/com/bnyer/order/controller/VipOrderController.java | 3 ++- .../java/com/bnyer/pay/aop/LimitRepeatRequestAspect.java | 5 +++-- .../main/java/com/bnyer/pay/controller/DYPayController.java | 4 +--- .../java/com/bnyer/pay/controller/UnifiedPayController.java | 5 +++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/aop/LimitRepeatRequestAspect.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/aop/LimitRepeatRequestAspect.java index fd8022d..e1fccc3 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/aop/LimitRepeatRequestAspect.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/aop/LimitRepeatRequestAspect.java @@ -8,6 +8,7 @@ import com.bnyer.common.core.enums.ResponseEnum; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.MD5Util; import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.core.utils.bean.EntityConvertUtil; import com.bnyer.common.core.vo.UserInfoVo; import com.bnyer.common.redis.service.RedissonService; import com.bnyer.common.security.utils.SecurityUtils; @@ -81,7 +82,7 @@ public class LimitRepeatRequestAspect { //部分参数做重复请求限制 if (Objects.nonNull(requestParams)){ String[] bodyParam = limitRepeatRequest.bodyParam(); - if (bodyParam != null){ + if (bodyParam.length > 0){ for (String param : bodyParam) { key.append("#"); Object obj = requestParams.get(param); @@ -121,7 +122,7 @@ public class LimitRepeatRequestAspect { private JSONObject getRequestParams(ProceedingJoinPoint joinPoint) { Object[] args = joinPoint.getArgs(); if (args != null && args.length != 0){ - return JSON.parseObject(args[0].toString()); + return EntityConvertUtil.convertBean(args[0],JSONObject.class); } return null; } diff --git a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java index d3358dd..4eb59fa 100644 --- a/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java +++ b/bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java @@ -1,5 +1,6 @@ package com.bnyer.order.controller; +import com.bnyer.common.core.annotation.LimitRepeatRequest; import com.bnyer.common.core.domain.R; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.order.bean.dto.AddVipOrderDto; @@ -38,7 +39,7 @@ public class VipOrderController extends BaseController { /** * 提交订单 */ - //@LimitRepeatRequest(bodyAllParam = true, message = "您的订单已提交,请勿频繁操作") + @LimitRepeatRequest(bodyAllParam = true, message = "您的订单已提交,请勿频繁操作") @PostMapping("/addVipOrder") @Operation(summary = "生成会员订单，返回订单号" , description = "生成会员订单，返回订单号，通过订单号调用支付接口") public R addVipOrder(@Valid @RequestBody AddVipOrderDto addVipOrderDto) { diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/aop/LimitRepeatRequestAspect.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/aop/LimitRepeatRequestAspect.java index 82f2d87..d122640 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/aop/LimitRepeatRequestAspect.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/aop/LimitRepeatRequestAspect.java @@ -9,6 +9,7 @@ import com.bnyer.common.core.enums.ResponseEnum; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.MD5Util; import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.core.utils.bean.EntityConvertUtil; import com.bnyer.common.core.vo.UserInfoVo; import com.bnyer.common.redis.service.RedissonService; import com.bnyer.common.security.utils.SecurityUtils; @@ -81,7 +82,7 @@ public class LimitRepeatRequestAspect { //部分参数做重复请求限制 if (Objects.nonNull(requestParams)){ String[] bodyParam = limitRepeatRequest.bodyParam(); - if (bodyParam != null){ + if (bodyParam.length > 0){ for (String param : bodyParam) { key.append("#"); Object obj = requestParams.get(param); @@ -121,7 +122,7 @@ public class LimitRepeatRequestAspect { private JSONObject getRequestParams(ProceedingJoinPoint joinPoint) { Object[] args = joinPoint.getArgs(); if (args != null && args.length != 0){ - return JSON.parseObject(args[0].toString()); + return EntityConvertUtil.convertBean(args[0],JSONObject.class); } return null; } diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/DYPayController.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/DYPayController.java index 5f4a950..c728334 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/DYPayController.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/DYPayController.java @@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; - /** * @author :WXC * @Date :2023/04/24 @@ -31,7 +29,7 @@ public class DYPayController { @ApiOperation(value = "抖音支付结果通知") @ResponseBody @PostMapping("/dypayBack") - public JSONObject dyPayNotify(@RequestBody JSONObject object, HttpServletRequest request) { + public JSONObject dyPayNotify(@RequestBody JSONObject object) { log.info("抖音支付异步通知开始==============》{}", object); IPayStrategy payStrategy = PayFactory.getInstance().getConcreteStrategy(EnumPayType.DY_PAY.getType()); String payNotify = payStrategy.parsePayNotify(JSON.toJSONString(object)); diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java index baa5b67..39024cc 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java @@ -1,5 +1,6 @@ package com.bnyer.pay.controller; +import com.bnyer.common.core.annotation.LimitRepeatRequest; import com.bnyer.common.core.domain.R; import com.bnyer.common.core.enums.ResponseEnum; import com.bnyer.common.core.exception.ServiceException; @@ -39,7 +40,7 @@ public class UnifiedPayController { @Autowired private UnifiedPayService unifiedPayService; - //@LimitRepeatRequest(bodyAllParam = true, message = "您的订单已提交,请勿频繁操作") + @LimitRepeatRequest(bodyAllParam = true, message = "您的订单已提交,请勿频繁操作") @PostMapping("/unifiedOrder") @Operation(summary = "统一下单，并生成支付订单" , description = "生成支付订单,返回前端支付所需参数") public R unifiedOrder(@Valid @RequestBody UnifiedOrderDto dto, HttpServletRequest request){ @@ -57,7 +58,7 @@ public class UnifiedPayController { return R.ok(queryOrderVo); } - //@LimitRepeatRequest(time = 10, message = "请勿频繁操作") + @LimitRepeatRequest(time = 10, message = "请勿频繁操作") @PostMapping("/refund") @Operation(summary = "统一退款" , description = "统一退款") public R refund(@Valid @RequestBody RefundDto dto){