From b7f60a6a08b65df548a20879ca700b9cfa574925 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Wed, 22 Jan 2025 15:16:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/wfc/gateway/filter/AuthFilter.java | 3 ++- .../wfc/payment/pay/wxpay/controller/WxPayController.java | 2 +- .../main/java/org/wfc/user/api/omada/OmadaWifiApi.java | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/filter/AuthFilter.java b/wfc-gateway/src/main/java/org/wfc/gateway/filter/AuthFilter.java index 43d0aa0..d60b061 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/filter/AuthFilter.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/filter/AuthFilter.java @@ -41,7 +41,8 @@ public class AuthFilter implements GlobalFilter, Ordered @Autowired private RedisService redisService; - private static final String[] feignOmadaUrls = {"system/dashboard/overview", "system/dashboard/page", "schedule/job/run", "system/client/list"}; + private static final String[] feignOmadaUrls = {"system/dashboard/overview", "system/dashboard/page", "schedule/job/run", + "system/client/list", "u/order", "u/order/paySuccess", "/payment/aliPay/callback", "/payment/wxPay/callback"}; @Override diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java index 70759b0..cea4287 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/wxpay/controller/WxPayController.java @@ -96,7 +96,7 @@ public class WxPayController extends AbstractWxPayApiController { .domain(wxPayBean.getDomain()) .build(); } - notifyUrl = apiConfig.getDomain().concat("/payment/aliPay/callback"); + notifyUrl = apiConfig.getDomain().concat("/payment/wxPay/callback"); refundNotifyUrl = apiConfig.getDomain().concat("/wxPay/refundNotify"); return apiConfig; } diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java index 6fca056..261033b 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/api/omada/OmadaWifiApi.java @@ -44,19 +44,21 @@ public class OmadaWifiApi extends AbstractOmadaWifiApi { @Override public boolean authClient(String siteId, String clientMac) { - omadaAuthorizedClientApi.authClient(siteId, clientMac); + ResponseEntity response = omadaAuthorizedClientApi.authClient(siteId, clientMac); + log.info(Objects.requireNonNull(response.getBody()).getMsg()); return true; } @Override public boolean cancelAuthClient(String siteId, String clientMac) { - omadaAuthorizedClientApi.cancelAuthClient(siteId, clientMac); + ResponseEntity response = omadaAuthorizedClientApi.cancelAuthClient(siteId, clientMac); + log.info(Objects.requireNonNull(response.getBody()).getMsg()); return true; } @Override public boolean reconnectClient(String siteId, String clientMac) { - omadaClientApi.reconnectClient(siteId, clientMac); + ResponseEntity response = omadaClientApi.reconnectClient(siteId, clientMac); return false; }