diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/MobileValidator.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/MobileValidator.java index 663f6fa07..ff7f8c65b 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/MobileValidator.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/MobileValidator.java @@ -3,6 +3,7 @@ package com.cf.imes.framework.common.validation; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ArrayUtil; import com.cf.imes.framework.common.util.validation.ValidationUtils; +import org.apache.commons.lang3.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -11,10 +12,13 @@ public class MobileValidator implements ConstraintValidator { private String[] ignoreWhenCheck; + private String message; + @Override public void initialize(Mobile constraintAnnotation) { ConstraintValidator.super.initialize(constraintAnnotation); this.ignoreWhenCheck = constraintAnnotation.ignoreWhenCheck(); + this.message = constraintAnnotation.message(); } @Override @@ -26,6 +30,10 @@ public class MobileValidator implements ConstraintValidator { if (CharSequenceUtil.isEmpty(value)) { return true; } + if (StringUtils.isNotEmpty(message)) { + context.disableDefaultConstraintViolation(); // 禁用默认的 message 的值 + context.buildConstraintViolationWithTemplate(message).addConstraintViolation(); + } // 校验手机 return ValidationUtils.isMobile(value); } 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 bccbb2dea..79eea4db0 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 @@ -112,7 +112,7 @@ public class AuthController { @OperateLog(enable = false) @Parameter(name = "mobile", description = "手机号", required = true) public CommonResult loginCheck( - @Param("mobile") @NotEmpty(message = "手机号不能为空") @Mobile(ignoreWhenCheck = {"admin"}) String mobile) { + @Param("mobile") @NotEmpty(message = "手机号不能为空") @Mobile(message = "账号密码不正确,请重新输入", ignoreWhenCheck = {"admin"}) String mobile) { return success(authService.loginCheck(mobile)); }