From 680ed4596f4459d6c9a997c737b9832c78244028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Sat, 17 May 2025 10:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B5=81=E7=A8=8Bbug=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E8=AF=B4=E6=98=8E=20--ErrorCode.java=20=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81=20--LoginControll?= =?UTF-8?q?er.java=20=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1=E6=B5=81?= =?UTF-8?q?=E7=A8=8Bbug=20--messages.properties=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E4=B8=9A=E5=8A=A1=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/xiaozhi/common/exception/ErrorCode.java | 2 +- .../modules/security/controller/LoginController.java | 12 +++++------- .../src/main/resources/i18n/messages.properties | 1 + 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java b/main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java index c59a6a14..6a9af011 100644 --- a/main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java +++ b/main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java @@ -20,7 +20,7 @@ public interface ErrorCode { int ACCOUNT_DISABLE = 10005; int IDENTIFIER_NOT_NULL = 10006; int CAPTCHA_ERROR = 10007; - int SUB_MENU_EXIST = 10008; + int PHONE_NOT_NULL = 10008; int PASSWORD_ERROR = 10009; int SUPERIOR_DEPT_ERROR = 10011; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java index 7731caa0..8ffd2b95 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java @@ -59,8 +59,8 @@ public class LoginController { @GetMapping("/smsVerification") @Operation(summary = "短信验证码") public void smsVerification(String phone) throws IOException { - // uuid不能为空 - AssertUtils.isBlank(phone, ErrorCode.IDENTIFIER_NOT_NULL); + // 手机号码不能为空 + AssertUtils.isBlank(phone, ErrorCode.PHONE_NOT_NULL); // 发送短信验证码 captchaService.sendSMSValidateCode(phone); } @@ -99,7 +99,7 @@ public class LoginController { if (isMobileRegister) { // 验证用户是否是手机号码 boolean validPhone = ValidatorUtils.isValidPhone(login.getUsername()); - if (validPhone) { + if (!validPhone) { throw new RenException("用户名不是手机号码，请重新输入"); } // 验证短信验证码是否正常 @@ -156,8 +156,8 @@ public class LoginController { ValidatorUtils.validateEntity(dto); // 验证用户是否是手机号码 boolean validPhone = ValidatorUtils.isValidPhone(dto.getPhone()); - if (validPhone) { - throw new RenException("用户名不是手机号码，请重新输入"); + if (!validPhone) { + throw new RenException("用户名不是手机号码，无法提供找回密码服务"); }; // 按照用户名获取用户 @@ -165,8 +165,6 @@ public class LoginController { if (userDTO == null) { throw new RenException("用户名或验证码错误"); } - // 验证用户是否是手机号码 - ValidatorUtils.isValidPhone(dto.getPhone()); // 验证短信验证码是否正常 boolean validate = captchaService.validateSMSValidateCode(dto.getPhone(),dto.getCode()); // 判断是否通过验证 diff --git a/main/manager-api/src/main/resources/i18n/messages.properties b/main/manager-api/src/main/resources/i18n/messages.properties index 5126feb2..8d04c5a0 100644 --- a/main/manager-api/src/main/resources/i18n/messages.properties +++ b/main/manager-api/src/main/resources/i18n/messages.properties @@ -9,6 +9,7 @@ 10005=\u8D26\u53F7\u5DF2\u88AB\u505C\u7528 10006=\u552F\u4E00\u6807\u8BC6\u4E0D\u80FD\u4E3A\u7A7A 10007=\u9A8C\u8BC1\u7801\u4E0D\u6B63\u786E +10008=\u624B\u673A\u53F7\u7801\u4E0D\u53EF\u4EE5\u4E3A\u7A7A 10009=\u539F\u5BC6\u7801\u4E0D\u6B63\u786E 10010=\u8D26\u53F7\u6216\u5BC6\u7801\u4E0D\u6B63\u786E,\u60A8\u8FD8\u6709\u53EF\u4EE5\u5C1D\u8BD5{0}\u6B21 10011=\u4E0A\u7EA7\u90E8\u95E8\u9009\u62E9\u9519\u8BEF