timi/TimiServerAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Regex update for timi-utils

Browse Source
This commit is contained in:
Timi
2025-11-06 14:53:46 +08:00
parent 05e15998f5
commit 723992f360
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserNameValidator.java
View File

@ -1,9 +1,9 @@
package com.imyeyu.api.modules.common.validation.validtor; package com.imyeyu.api.modules.common.validation.validtor;
import com.imyeyu.java.TimiJava;
import com.imyeyu.api.modules.common.validation.UserName; import com.imyeyu.api.modules.common.validation.UserName;
import com.imyeyu.java.TimiJava;
import com.imyeyu.spring.util.AbstractValidator; 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<UserName, String> {
if (userName.contains("@")) { if (userName.contains("@")) {
return "user.name.contains_at"; 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"; 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 "user.name.not_match_regex";
} }
return null; return null;

6
src/main/java/com/imyeyu/api/modules/common/validation/validtor/UserPasswordValidator.java
View File

@ -1,9 +1,9 @@
package com.imyeyu.api.modules.common.validation.validtor; package com.imyeyu.api.modules.common.validation.validtor;
import com.imyeyu.java.TimiJava;
import com.imyeyu.api.modules.common.validation.UserPassword; import com.imyeyu.api.modules.common.validation.UserPassword;
import com.imyeyu.java.TimiJava;
import com.imyeyu.spring.util.AbstractValidator; 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<UserPassword, Strin
if (20 < password.length()) { if (20 < password.length()) {
return "user.password.too_long"; return "user.password.too_long";
} }
if (!Text.testReg("(?=.*([a-zA-Z].*))(?=.*[0-9].*)[a-zA-Z0-9-*/+.~!@#$%^&*()]{6,20}$", password)) { if (Regex.isNotMatch("(?=.*([a-zA-Z].*))(?=.*[0-9].*)[a-zA-Z0-9-*/+.~!@#$%^&*()]{6,20}$", password)) {
return "user.password.not_match_regex"; return "user.password.not_match_regex";
} }
return null; return null;