diff --git a/ruoyi-api/src/main/java/org/dromara/system/api/model/SmsLoginBody.java b/ruoyi-api/src/main/java/org/dromara/system/api/model/SmsLoginBody.java index 9ffa3de6b..b88d1c3e7 100644 --- a/ruoyi-api/src/main/java/org/dromara/system/api/model/SmsLoginBody.java +++ b/ruoyi-api/src/main/java/org/dromara/system/api/model/SmsLoginBody.java @@ -1,8 +1,10 @@ package org.dromara.system.api.model; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.core.constant.RegexConstants; import org.dromara.common.core.domain.model.LoginBody; /** @@ -18,6 +20,7 @@ public class SmsLoginBody extends LoginBody { * 手机号 */ @NotBlank(message = "{user.phonenumber.not.blank}") + @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确") private String phoneNumber; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java index 93ce15029..6e3036507 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java @@ -3,9 +3,11 @@ package org.dromara.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.core.constant.RegexConstants; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.xss.Xss; import org.dromara.system.domain.SysUser; @@ -70,6 +72,7 @@ public class SysUserBo implements Serializable { /** * 手机号码 */ + @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确") private String phoneNumber; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java index 2b6ee093b..4af9bf7a2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.dromara.common.core.constant.RegexConstants; import org.dromara.common.core.xss.Xss; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; import java.io.Serial; import java.io.Serializable; @@ -36,7 +34,6 @@ public class SysUserProfileBo implements Serializable { /** * 用户邮箱 */ - @Sensitive(strategy = SensitiveStrategy.EMAIL) @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") private String email; @@ -45,7 +42,6 @@ public class SysUserProfileBo implements Serializable { * 手机号码 */ @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确") - @Sensitive(strategy = SensitiveStrategy.PHONE) private String phoneNumber; /**