소스 검색

修改获取生成密码规则将其排序

xusl 1 년 전
부모
커밋
7b6efd5d7e
1개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. 7 0
      backend/src/main/java/com/jiayue/ssi/util/RandomRulePwd.java

+ 7 - 0
backend/src/main/java/com/jiayue/ssi/util/RandomRulePwd.java

@@ -1,8 +1,12 @@
 package com.jiayue.ssi.util;
 package com.jiayue.ssi.util;
 
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 
 
+import java.util.Collections;
+import java.util.List;
+
 /**
 /**
 * 初始/重置密码生成
 * 初始/重置密码生成
 *
 *
@@ -18,6 +22,9 @@ public class RandomRulePwd {
 
 
     public static String createPwd(String rule,int strLength){
     public static String createPwd(String rule,int strLength){
         String randomString="";
         String randomString="";
+        List<String> strList = Convert.toList(String.class,rule);
+        Collections.sort(strList);
+        rule = String.join(",",strList);
         if ("A,B,C".equals(rule)){
         if ("A,B,C".equals(rule)){
             while (!(StrUtil.containsAny(randomString,upperStr.split("")) && StrUtil.containsAny(randomString,lowerStr.split("")) && StrUtil.containsAny(randomString,numStr.split("")))){
             while (!(StrUtil.containsAny(randomString,upperStr.split("")) && StrUtil.containsAny(randomString,lowerStr.split("")) && StrUtil.containsAny(randomString,numStr.split("")))){
                 randomString = cn.hutool.core.util.RandomUtil.randomString(upperStr + lowerStr + numStr, strLength);
                 randomString = cn.hutool.core.util.RandomUtil.randomString(upperStr + lowerStr + numStr, strLength);