更新随机密码生成器

src/main/java/cn/quantgroup/xyqb/util/PasswordUtil.java

@@ -22,7 +22,9 @@ public class PasswordUtil {
     private static final char[] PWD_BASE = {
             'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
             'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
-            'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+            'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+            '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', ':', ';',
+            '<', '=', '>', '?', '@', '[', '\\', ']', '^', '_', '`', '{', '|', '}', '~'
     };
 
     public final static String MD5WithSalt(String s){
@@ -63,16 +65,11 @@ public class PasswordUtil {
      */
     public static String generateRandomPwd(int pwdLen) {
         Preconditions.checkArgument(pwdLen > 0);
-        int pwdMax = PWD_BASE.length;
-        int i; // 生成的随机数
-        int count = 0; // 生成的密码的长度
         StringBuilder pwd = new StringBuilder();
-        while (count < pwdLen) {
-            i = ThreadLocalRandom.current().nextInt(pwdMax); // 生成的数最大为36-1
-            if (i >= 0 && i < PWD_BASE.length) {
-                pwd.append(PWD_BASE[i]);
-                count++;
-            }
+        while (pwd.length() < pwdLen) {
+            // 随机整数区间: [0, PWD_BASE.length - 1)
+            int index = ThreadLocalRandom.current().nextInt(0, PWD_BASE.length);
+            pwd.append(PWD_BASE[index]);
         }
         return pwd.toString();
     }