ztxkutils 2.10.38 → 2.10.39

package/dist/index.js

@@ -1,7 +1,7 @@
 export { c as authority } from './authority-e6bde99f.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
 export { t as tools } from './tools-09a4d620.js';
-export { v as validate } from './validate-e51e4026.js';
+export { v as validate } from './validate-a06e1fa0.js';
 export { r as request } from './request-8e2b5826.js';
 export { r as reqUrl } from './reqUrl-787dd9e5.js';
 import './tslib.es6-35653116.js';

package/dist/{validate-e51e4026.js → validate-a06e1fa0.js}

@@ -71,6 +71,19 @@ var commonMessage = {
     passwordMessage: '密码必须包含大小写字母、数字、特殊字符且最小长度为8，且不能出现连续数字或字符，不能出现相同字符，且禁止使用用户账号作为密码',
     spaceMessage: '请勿输入空格',
 };
+function isConsecutiveChars(char1, char2) {
+    var lowerCaseAlphabet = 'abcdefghijklmnopqrstuvwxyz'; // 小写字母
+    var upperCaseAlphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; // 大写字母
+    var numeric = '0123456789'; // 数字
+    // 找到包含两个字符的字符集
+    var alphabet = [lowerCaseAlphabet, upperCaseAlphabet, numeric].find(function (alph) { return alph.includes(char1) && alph.includes(char2); });
+    if (!alphabet) {
+        return false; // 如果两个字符不在同一字符集中，那么它们不可能连续
+    }
+    var index1 = alphabet.indexOf(char1);
+    var index2 = alphabet.indexOf(char2);
+    return Math.abs(index1 - index2) === 1; // 如果两个字符在字符集中的位置相邻，那么它们是连续的
+}
 function validatePassword(password, username) {
     // 用正则表达式检查密码基本规则
     var regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$/;
@@ -80,13 +93,26 @@ function validatePassword(password, username) {
             message: '密码中必须包含大小写字母、数字、特殊字符,且长度必须大于8个字符!',
         };
     }
-    // 检查密码中是否有连续的字母或数字
+    // 检查密码中是否有连续的字母或数字 连续超过三次
+    var count = 0;
+    var startChart = 0;
     for (var i = 0; i < password.length - 1; i++) {
-        if (Math.abs(password.charCodeAt(i) - password.charCodeAt(i + 1)) === 1) {
-            return {
-                result: false,
-                message: '密码中有连续的字母或数字!',
-            };
+        if (isConsecutiveChars(password[i], password[i + 1])) {
+            if (count === 0) {
+                startChart = i;
+            }
+            count++;
+            if (count >= 2) {
+                // 密码中不应含有连续的字母或数字
+                return {
+                    result: false,
+                    message: "\u4ECE\u7B2C" + (startChart + 1) + "\u4E2A\u5B57\u7B26\u5F00\u59CB\uFF0C\u6709\u8FDE\u7EED\u8D85\u8FC7\u4E09\u4F4D\u7684\u5B57\u6BCD\u6216\u6570\u5B57!",
+                };
+            }
+        }
+        else {
+            count = 0;
+            startChart = 0;
         }
     }
     // 检查密码中是否有相同的字符

package/dist/validate.js

@@ -1 +1 @@
-export { c as commonMessage, b as validate, a as validatePassword } from './validate-e51e4026.js';
+export { c as commonMessage, b as validate, a as validatePassword } from './validate-a06e1fa0.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.38",
+  "version": "2.10.39",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",