From 2ae7616fde2fe8ae5a22c0e75588bda49ac69118 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Sat, 8 Feb 2025 18:09:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/pay/alipay/controller/AliPayController.java | 4 ++-- .../main/java/org/wfc/user/api/omada/OmadaWifiApi.java | 9 +++++---- .../java/org/wfc/user/controller/UEmailController.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AliPayController.java b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AliPayController.java index b4e5299..46ad5c3 100644 --- a/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AliPayController.java +++ b/wfc-modules/wfc-payment/src/main/java/org/wfc/payment/pay/alipay/controller/AliPayController.java @@ -162,7 +162,7 @@ public class AliPayController extends AbstractAliPayApiController { // String notifyUrl = aliPayBean.getDomain() + NOTIFY_URL; String notifyUrl = aliPayBean.getDomain() + PRE_NOTIFY_URL + NOTIFY_URL; if (StrUtil.isNotBlank(aliPayBean.getTestDomain())) { - notifyUrl = aliPayBean.getTestDomain() + TEST_PRE_NOTIFY_URL + NOTIFY_URL; + notifyUrl = aliPayBean.getTestDomain() + PRE_NOTIFY_URL + NOTIFY_URL; } @@ -203,7 +203,7 @@ public class AliPayController extends AbstractAliPayApiController { String returnUrl = aliPayBean.getDomain() + RETURN_URL; String notifyUrl = aliPayBean.getDomain() + PRE_NOTIFY_URL + NOTIFY_URL; if (StrUtil.isNotBlank(aliPayBean.getTestDomain())) { - notifyUrl = aliPayBean.getTestDomain() + TEST_PRE_NOTIFY_URL + NOTIFY_URL; + notifyUrl = aliPayBean.getTestDomain() + PRE_NOTIFY_URL + NOTIFY_URL; } AlipayTradePagePayModel model = new AlipayTradePagePayModel(); 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 ad2d7f3..887fc8e 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 @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; +import org.wfc.common.core.constant.WifiConstants; import org.wfc.omada.api.client.OmadaClientApi; import org.wfc.omada.api.client.model.ClientRateLimitSetting; import org.wfc.omada.api.client.model.CustomRateLimitEntity; @@ -46,7 +47,7 @@ public class OmadaWifiApi extends AbstractOmadaWifiApi { public boolean authClient(String siteId, String clientMac) { ResponseEntity response = omadaAuthorizedClientApi.authClient(siteId, clientMac); if (ObjectUtil.isNotNull(response.getBody())) { - if (response.getBody().getErrorCode() == 0) { + if (response.getBody().getErrorCode() == WifiConstants.ERROR_CODE_SUCCESS) { log.info("authClient success,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg()); } else { log.error("authClient error,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg()); @@ -59,7 +60,7 @@ public class OmadaWifiApi extends AbstractOmadaWifiApi { public boolean cancelAuthClient(String siteId, String clientMac) { ResponseEntity response = omadaAuthorizedClientApi.cancelAuthClient(siteId, clientMac); if (ObjectUtil.isNotNull(response.getBody())) { - if (response.getBody().getErrorCode() == 0) { + if (response.getBody().getErrorCode() == WifiConstants.ERROR_CODE_SUCCESS) { log.info("cancelAuthClient success,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg()); } else { log.error("cancelAuthClient error,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg()); @@ -72,7 +73,7 @@ public class OmadaWifiApi extends AbstractOmadaWifiApi { public boolean reconnectClient(String siteId, String clientMac) { ResponseEntity response = omadaClientApi.reconnectClient(siteId, clientMac); if (ObjectUtil.isNotNull(response.getBody())) { - if (response.getBody().getErrorCode() == 0) { + if (response.getBody().getErrorCode() == WifiConstants.ERROR_CODE_SUCCESS) { log.info("reconnectClient success,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg()); } else { log.error("reconnectClient error,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg()); @@ -159,7 +160,7 @@ public class OmadaWifiApi extends AbstractOmadaWifiApi { } ResponseEntity response = omadaClientApi.updateClientRateLimitSetting(siteId, clientMac, clientRateLimitSetting); if (ObjectUtil.isNotNull(response.getBody())) { - if (response.getBody().getErrorCode() == 0) { + if (response.getBody().getErrorCode() == WifiConstants.ERROR_CODE_SUCCESS) { log.info("updateClientRateLimitSetting success,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg()); } else { log.error("updateClientRateLimitSetting error,siteId={},clientMac={},errorCode={}, msg={}", siteId, clientMac, response.getBody().getErrorCode(), response.getBody().getMsg()); diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UEmailController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UEmailController.java index 6001707..d336b75 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UEmailController.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UEmailController.java @@ -51,7 +51,7 @@ public class UEmailController extends BaseController { try { MailUtils.sendText(email, "Your WANFI verification code", "Hi\nYour verification code is:\n" + code + "\nThis code will expire in " + Constants.MAIL_CAPTCHA_EXPIRATION + " minutes.\nFor your security, don't share it with anyone."); } catch (Exception e) { - log.error("验证码短信发送异常 => {}", e.getMessage()); + log.error("email verification code send failed => {}", e.getMessage()); return R.fail(e.getMessage()); } return R.ok();