Merge pull request 'v0.0.10' (#9) from dev into master

Reviewed-on: #9

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.imyeyu.utils</groupId>
 	<artifactId>timi-utils</artifactId>
-	<version>0.0.6</version>
+	<version>0.0.10</version>
 
 	<properties>
 		<maven.test.skip>true</maven.test.skip>
@@ -91,7 +91,7 @@
 		<dependency>
 			<groupId>com.imyeyu.java</groupId>
 			<artifactId>timi-java</artifactId>
-			<version>0.0.4</version>
+			<version>0.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>de.mkammerer</groupId>
@@ -108,7 +108,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.34</version>
+			<version>1.18.46</version>
 		</dependency>
 	</dependencies>
 </project>

src/main/java/com/imyeyu/utils/Regex.java

@@ -52,8 +52,8 @@ public class Regex {
 	/** 用户名 (4-16 位字母、数字、下划线) */
 	public static final String USERNAME = "^[a-zA-Z0-9_]{4,16}$";
 
-	/** 密码 (6-18 位，包含字母和数字) */
-	public static final String PASSWORD = "^(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z0-9]{6,18}$";
+	/** 密码 (6-18 位，包含字母和数字，允许特殊字符) */
+	public static final String PASSWORD = "^(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z0-9!#$%&()*+,\\-./:;<=>?@\\[\\]\\^_`{|}~]{6,32}$";
 
 	/** 中文字符 */
 	public static final String CHINESE_CHAR = "^[\\u4e00-\\u9fa5]+$";

src/main/java/com/imyeyu/utils/Text.java

@@ -15,8 +15,16 @@ import java.util.UUID;
  */
 public class Text {
 
+	public static String LETTER_POOL = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+	public static String NUMBER_POOL = "0123456789";
+
+	public static String LETTER_NUMBER_POOL = LETTER_POOL + NUMBER_POOL;
+
+	public static String PASSWORD_CHAR_POOL = LETTER_NUMBER_POOL + "!#$%&()*+,-./:;<=>?@[]^_`{|}~";
+
 	/** 十六进制小写 */
-	public static char[] HEX_DIGITS_LOWER = "0123456789abcdef".toCharArray();
+	public static char[] HEX_DIGITS_LOWER = (NUMBER_POOL + "abcdef").toCharArray();
 
 	/**
 	 * 是否为半角字符
@@ -75,8 +83,8 @@ public class Text {
 	 * @return true 时全部其他字符串和比较字符串一致
 	 */
 	public static boolean eqAnd(String string, String... other) {
-		for (int i = 0; i < other.length; i++) {
-			if (!string.equals(other[i])) {
+		for (String s : other) {
+			if (!string.equals(s)) {
 				return false;
 			}
 		}
@@ -91,8 +99,8 @@ public class Text {
 	 * @return true 时其他字符串存在和比较字符串一致
 	 */
 	public static boolean eqOr(String string, String... other) {
-		for (int i = 0; i < other.length; i++) {
-			if (!string.equals(other[i])) {
+		for (String s : other) {
+			if (!string.equals(s)) {
 				return false;
 			}
 		}
@@ -107,8 +115,8 @@ public class Text {
 	 * @return true 时全部其他字符串和比较字符串一致
 	 */
 	public static boolean eqIgnoreCaseAnd(String string, String... other) {
-		for (int i = 0; i < other.length; i++) {
-			if (!string.equalsIgnoreCase(other[i])) {
+		for (String s : other) {
+			if (!string.equalsIgnoreCase(s)) {
 				return false;
 			}
 		}
@@ -123,8 +131,8 @@ public class Text {
 	 * @return true 时其他字符串存在和比较字符串一致
 	 */
 	public static boolean eqIgnoreCaseOr(String string, String... other) {
-		for (int i = 0; i < other.length; i++) {
-			if (string.equalsIgnoreCase(other[i])) {
+		for (String s : other) {
+			if (string.equalsIgnoreCase(s)) {
 				return true;
 			}
 		}
@@ -141,8 +149,8 @@ public class Text {
 	public static boolean containsIgnoreCase(String string, String... other) {
 		String stringUpper = string.toUpperCase();
 		String stringLower = string.toLowerCase();
-		for (int i = 0; i < other.length; i++) {
-			if (stringLower.contains(other[i].toLowerCase()) || stringUpper.contains(other[i].toUpperCase())) {
+		for (String s : other) {
+			if (stringLower.contains(s.toLowerCase()) || stringUpper.contains(s.toUpperCase())) {
 				return true;
 			}
 		}
@@ -150,18 +158,38 @@ public class Text {
 	}
 
 	public static String randomString(int length) {
-		return randomString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", length);
+		return randomString(LETTER_NUMBER_POOL, length);
 	}
 
 	public static String randomString(String pool, int length) {
 		SecureRandom r = new SecureRandom();
 		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < length; i++) {
-			sb.append(pool.charAt(r.nextInt(pool.length() - 1)));
+			sb.append(pool.charAt(r.nextInt(pool.length())));
 		}
 		return sb.toString();
 	}
 
+	public static String randomPassword(int length) {
+		if (length < 6 || 32 < length) {
+			throw new IllegalArgumentException("Password length must be between 6 and 32");
+		}
+		SecureRandom r = new SecureRandom();
+		char[] chars = new char[length];
+		chars[0] = LETTER_POOL.charAt(r.nextInt(LETTER_POOL.length()));
+		chars[1] = NUMBER_POOL.charAt(r.nextInt(NUMBER_POOL.length()));
+		for (int i = 2; i < length; i++) {
+			chars[i] = PASSWORD_CHAR_POOL.charAt(r.nextInt(PASSWORD_CHAR_POOL.length()));
+		}
+		for (int i = chars.length - 1; 0 < i; i--) {
+			int j = r.nextInt(i + 1);
+			char temp = chars[i];
+			chars[i] = chars[j];
+			chars[j] = temp;
+		}
+		return new String(chars);
+	}
+
 	/**
 	 * 较短的临时 UUID，如果使用在庞大的数据里，很可能会发生重复
 	 *
@@ -403,4 +431,8 @@ public class Text {
 	public static String underscoreClassName(Class<?> clazz) {
 		return camelCase2underscore(clazz.getSimpleName());
 	}
+
+	public static String bizClassName(Class<?> clazz) {
+		return underscoreClassName(clazz).toUpperCase();
+	}
 }

src/test/java/test/TestRegex.java

@@ -0,0 +1,36 @@
+package test;
+
+import com.imyeyu.utils.Regex;
+import com.imyeyu.utils.Text;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author 夜雨
+ * @since 2026-06-11 14:00
+ */
+public class TestRegex {
+
+	@Test
+	public void testPassword() {
+		assert Regex.isMatch(Regex.PASSWORD, "abc123");
+		assert Regex.isMatch(Regex.PASSWORD, "abc123!");
+		assert Regex.isMatch(Regex.PASSWORD, "Abc123[]^_`{|}~");
+		assert Regex.isMatch(Regex.PASSWORD, "A1!#$%&*+,-./:@?");
+		for (int i = 0; i < 20; i++) {
+			assert Regex.isMatch(Regex.PASSWORD, Text.randomPassword(20));
+		}
+
+		assert Regex.isNotMatch(Regex.PASSWORD, "abcdef!");
+		assert Regex.isNotMatch(Regex.PASSWORD, "123456!");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Ab1!");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abcdefghijklmnopqrstuvwxzy123456!");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abc123\\");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abc123\"");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abc123'");
+		assert Regex.isNotMatch(Regex.PASSWORD, "Abc123 ");
+		assertThrows(IllegalArgumentException.class, () -> Text.randomPassword(5));
+		assertThrows(IllegalArgumentException.class, () -> Text.randomPassword(33));
+	}
+}