diff --git a/src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserNameValidator.java b/src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserNameValidator.java index 58bc8f9..3cc8bc7 100644 --- a/src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserNameValidator.java +++ b/src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserNameValidator.java @@ -1,9 +1,9 @@ package com.imyeyu.api.modules.common.validation.validtor; -import com.imyeyu.java.TimiJava; import com.imyeyu.api.modules.common.validation.UserName; +import com.imyeyu.java.TimiJava; import com.imyeyu.spring.util.AbstractValidator; -import com.imyeyu.utils.Text; +import com.imyeyu.utils.Regex; /** * 用户名基本验证 @@ -24,10 +24,10 @@ public class UserNameValidator extends AbstractValidator { if (userName.contains("@")) { return "user.name.contains_at"; } - if (Text.testReg("^[0-9]+.?[0-9]*$", userName)) { + if (Regex.isMatch("^[0-9]+.?[0-9]*$", userName)) { return "user.name.only_number"; } - if (!Text.testReg("^[A-Za-z0-9_一-龥]+$", userName)) { + if (Regex.isNotMatch("^[A-Za-z0-9_一-龥]+$", userName)) { return "user.name.not_match_regex"; } return null; diff --git a/src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserPasswordValidator.java b/src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserPasswordValidator.java index 1b8daa9..cd4e8f2 100644 --- a/src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserPasswordValidator.java +++ b/src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserPasswordValidator.java @@ -1,9 +1,9 @@ package com.imyeyu.api.modules.common.validation.validtor; -import com.imyeyu.java.TimiJava; import com.imyeyu.api.modules.common.validation.UserPassword; +import com.imyeyu.java.TimiJava; import com.imyeyu.spring.util.AbstractValidator; -import com.imyeyu.utils.Text; +import com.imyeyu.utils.Regex; /** * 用户密码基本验证 @@ -24,7 +24,7 @@ public class UserPasswordValidator extends AbstractValidator