From 066fed242391c5ad1afe2c28dfdb655454c3e2d6 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 30 Dec 2024 11:02:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=81=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E6=A0=A1=E9=AA=8C=E7=9B=B8=E5=85=B3=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/api/sms/dto/code/SmsCodeSendReqDTO.java | 2 +- .../module/system/controller/admin/auth/AuthController.java | 4 ++-- .../controller/admin/auth/vo/AuthLoginSmsCheckReqVO.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java index 333dbf00d..56a5a9685 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java @@ -14,7 +14,7 @@ public class SmsCodeSendReqDTO { @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300") @Mobile - @NotEmpty(message = "手机号不能为空") + @NotEmpty(message = "请输入手机号") private String mobile; @Schema(description = "发送场景", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java index 79eea4db0..ad6d26ed4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java @@ -102,7 +102,7 @@ public class AuthController { @PermitAll @Operation(summary = "使用账号密码登录") @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 - public CommonResult login(@Valid @RequestBody AuthLoginReqVO reqVO, HttpServletRequest request) { + public CommonResult login(@Valid @RequestBody AuthLoginReqVO reqVO) { return success(authService.login(reqVO)); } @@ -112,7 +112,7 @@ public class AuthController { @OperateLog(enable = false) @Parameter(name = "mobile", description = "手机号", required = true) public CommonResult loginCheck( - @Param("mobile") @NotEmpty(message = "手机号不能为空") @Mobile(message = "账号密码不正确，请重新输入", ignoreWhenCheck = {"admin"}) String mobile) { + @Param("mobile") @NotEmpty(message = "请输入手机号") @Mobile(message = "账号密码不正确，请重新输入", ignoreWhenCheck = {"admin"}) String mobile) { return success(authService.loginCheck(mobile)); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginSmsCheckReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginSmsCheckReqVO.java index 85e54955f..b5d3c77b7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginSmsCheckReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/vo/AuthLoginSmsCheckReqVO.java @@ -20,11 +20,11 @@ public class AuthLoginSmsCheckReqVO { @Schema(description = "手机号码", example = "15601691300") @Length(min = 11, max = 11, message = "手机号长度必须 11 位") @Mobile - @NotEmpty(message = "手机号不能为空") + @NotEmpty(message = "请输入手机号") private String mobile; @Schema(description = "验证码", example = "123456") @Length(min = 6, max = 6, message = "短信验证码不正确") - @NotEmpty(message = "短信验证码不能为空") + @NotEmpty(message = "请输入短信验证码") private String smsCaptchaVerification; }