From 344d183b6f3e572a4f16af298eef303689a72d6a Mon Sep 17 00:00:00 2001 From: 3030332422 <3030332422@qq.com> Date: Sun, 28 Sep 2025 14:06:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dweb=E7=AB=AF=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E7=A0=81=E6=B3=A8=E5=86=8C=E6=97=B6=E9=81=87?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaozhi/modules/security/controller/LoginController.java | 2 +- .../src/test/java/xiaozhi/modules/sys/loginControllerTest.java | 1 - main/manager-web/src/i18n/en.js | 1 + main/manager-web/src/i18n/zh_CN.js | 1 + main/manager-web/src/i18n/zh_TW.js | 1 + main/manager-web/src/views/register.vue | 3 ++- 6 files changed, 6 insertions(+), 3 deletions(-) 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 6eadf124..0108a548 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 @@ -70,7 +70,7 @@ public class LoginController { @Operation(summary = "短信验证码") public Result smsVerification(@RequestBody SmsVerificationDTO dto) { // 验证图形验证码 - boolean validate = captchaService.validate(dto.getCaptchaId(), dto.getCaptcha(), true); + boolean validate = captchaService.validate(dto.getCaptchaId(), dto.getCaptcha(), false); if (!validate) { throw new RenException(ErrorCode.SMS_CAPTCHA_ERROR); } diff --git a/main/manager-api/src/test/java/xiaozhi/modules/sys/loginControllerTest.java b/main/manager-api/src/test/java/xiaozhi/modules/sys/loginControllerTest.java index 5cc39967..1175223b 100644 --- a/main/manager-api/src/test/java/xiaozhi/modules/sys/loginControllerTest.java +++ b/main/manager-api/src/test/java/xiaozhi/modules/sys/loginControllerTest.java @@ -24,7 +24,6 @@ class loginControllerTest { LoginDTO loginDTO = new LoginDTO(); loginDTO.setUsername("手机号码"); loginDTO.setPassword("密码"); - loginDTO.setCaptcha("123456"); loginController.register(loginDTO); } diff --git a/main/manager-web/src/i18n/en.js b/main/manager-web/src/i18n/en.js index be5da633..ae38c0e6 100644 --- a/main/manager-web/src/i18n/en.js +++ b/main/manager-web/src/i18n/en.js @@ -384,6 +384,7 @@ export default { 'register.registerSuccess': 'Registration successful!', 'register.registerFailed': 'Registration failed', 'register.passwordsNotMatch': 'The two passwords do not match', + 'register.secondsLater': 'seconds later', // Retrieve password page text 'retrievePassword.title': 'Reset Password', diff --git a/main/manager-web/src/i18n/zh_CN.js b/main/manager-web/src/i18n/zh_CN.js index 2bc6e8d8..28183c66 100644 --- a/main/manager-web/src/i18n/zh_CN.js +++ b/main/manager-web/src/i18n/zh_CN.js @@ -384,6 +384,7 @@ export default { 'register.registerSuccess': '注册成功!', 'register.registerFailed': '注册失败', 'register.passwordsNotMatch': '两次输入的密码不一致', + 'register.secondsLater': '秒后', // 忘记密码页面文本 'retrievePassword.title': '重置密码', diff --git a/main/manager-web/src/i18n/zh_TW.js b/main/manager-web/src/i18n/zh_TW.js index 886f000f..b34edd1d 100644 --- a/main/manager-web/src/i18n/zh_TW.js +++ b/main/manager-web/src/i18n/zh_TW.js @@ -253,6 +253,7 @@ export default { 'register.captchaSendSuccess': '驗證碼發送成功', 'register.captchaSendFailed': '驗證碼發送失敗', 'register.passwordsNotMatch': '兩次輸入的密碼不一致', + 'register.secondsLater': '秒後', 'register.registerSuccess': '註冊成功!', 'register.registerFailed': '註冊失敗', 'register.requiredUsername': '用戶名不能為空', diff --git a/main/manager-web/src/views/register.vue b/main/manager-web/src/views/register.vue index 3e9dd910..b2ac7cb9 100644 --- a/main/manager-web/src/views/register.vue +++ b/main/manager-web/src/views/register.vue @@ -353,7 +353,8 @@ export default { const registerData = { username: plainUsername, password: encryptedPassword, - captchaId: this.form.captchaId + captchaId: this.form.captchaId, + mobileCaptcha: this.form.mobileCaptcha }; Api.user.register(registerData, ({ data }) => {