Merge branch '王立生' of sckj/mz-cloud into master

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -14,9 +14,7 @@ import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.sm4.SM4Utils;
 import com.ruoyi.system.utils.Encryption;
 import com.ruoyi.system.utils.SubCodeUtil;
-import com.sun.javaws.Main;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
@@ -384,7 +382,7 @@ public class SecurityUtils
                 || (isPureChar && hasSpecChar) || isNumAndChar && hasSpecChar) || isNumAndChar;
         return isLegal;
     }
-    public static void mainTest(String[] args)
+    public static void mainTests(String[] args)
     {
        System.out.println(masks("我开双方都三始",1));
        System.out.println(masks("220122197601247014",2));

ruoyi-ui/src/api/tool/sm4.js

@@ -553,10 +553,14 @@ function maskArr(arr,type){
       {
         res.push(maskA(str, 2))
       }
-      else  //其他
+      else if (type == 6)//邮件地址
       {
         res.push(maskA(str, 1))
       }
+      else
+      {
+        res.push(str)
+      }
     }
     else {
       res.push(str)