diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java index b59379e33..15359ccf6 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java @@ -72,7 +72,7 @@ public class OrderPayController { @PostMapping("/h5Pay") public CzgResult> h5PayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { payParam.setShopId(shopId); - return payService.h5PayOrder(ServletUtil.getClientIPByHeader(request), payParam); + return payService.h5PayOrder(ServletUtil.getClientIP(request,""), payParam); } /** @@ -84,7 +84,7 @@ public class OrderPayController { @PostMapping("/jsPay") public CzgResult> jsPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { payParam.setShopId(shopId); - return payService.jsPayOrder(ServletUtil.getClientIPByHeader(request), payParam); + return payService.jsPayOrder(ServletUtil.getClientIP(request), payParam); } /** @@ -95,7 +95,7 @@ public class OrderPayController { @PostMapping("/ltPayOrder") public CzgResult> ltPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { payParam.setShopId(shopId); - return payService.ltPayOrder(ServletUtil.getClientIPByHeader(request), payParam); + return payService.ltPayOrder(ServletUtil.getClientIP(request), payParam); } /** @@ -104,7 +104,7 @@ public class OrderPayController { @PostMapping("/scanPay") public CzgResult> scanPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { payParam.setShopId(shopId); - return payService.scanPayOrder(ServletUtil.getClientIPByHeader(request), payParam); + return payService.scanPayOrder(ServletUtil.getClientIP(request), payParam); } /** @@ -148,7 +148,7 @@ public class OrderPayController { @PostMapping("/shopPayApi/js2Pay") public CzgResult> js2PayOrder(@RequestHeader Long shopId, HttpServletRequest request, @RequestBody OrderPayParamDTO payParam) { payParam.setShopId(shopId); - return payService.js2PayOrder(ServletUtil.getClientIPByHeader(request), payParam); + return payService.js2PayOrder(ServletUtil.getClientIP(request), payParam); } /** diff --git a/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java index 18b0b3cfd..601d65239 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java @@ -49,7 +49,7 @@ public class VipPayController { public CzgResult> jsPayVip(HttpServletRequest request, @Validated @RequestBody VipPayParamDTO payParam) { AssertUtil.isNull(payParam.getShopUserId(), "充值失败 未指定店铺用户Id"); payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType")); - return payService.jsPayVip(ServletUtil.getClientIPByHeader(request), payParam); + return payService.jsPayVip(ServletUtil.getClientIP(request), payParam); } /** @@ -61,7 +61,7 @@ public class VipPayController { public CzgResult> ltPayVip(HttpServletRequest request, @Validated @RequestBody VipPayParamDTO payParam) { AssertUtil.isNull(payParam.getShopUserId(), "充值失败 未指定店铺用户Id"); payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType")); - return payService.ltPayVip(ServletUtil.getClientIPByHeader(request), payParam); + return payService.ltPayVip(ServletUtil.getClientIP(request), payParam); } /** @@ -71,7 +71,7 @@ public class VipPayController { public CzgResult> scanPayVip(HttpServletRequest request, @Validated @RequestBody VipPayParamDTO payParam) { AssertUtil.isNull(payParam.getShopUserId(), "充值失败 未指定店铺用户Id"); payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(request, "platformType")); - return payService.scanPayVip(ServletUtil.getClientIPByHeader(request), payParam); + return payService.scanPayVip(ServletUtil.getClientIP(request), payParam); } /** diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/config/ControllerAspect.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/ControllerAspect.java index e1f5a4f10..bdd5a373c 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/ControllerAspect.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/config/ControllerAspect.java @@ -55,7 +55,7 @@ public class ControllerAspect { HttpServletRequest request = ServletUtil.getRequest(); String method = request.getMethod(); String requestUrl = request.getRequestURL().toString(); - String requestIp = ServletUtil.getClientIPByHeader(request); + String requestIp = ServletUtil.getClientIP(request); long useTime = end - start; ThreadUtil.execAsync(() -> { //请求的参数