From b6389c92c1f45f8494dbef02ead108c78796e997 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 4 Sep 2024 16:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=AD=A3=E5=88=99=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validate.js                      |   2 +-
 src/views/system/user/index.vue            |   6 +-
 src/views/system/user/profile/resetPwd.vue | 188 +++++++++++++--------
 3 files changed, 121 insertions(+), 75 deletions(-)

diff --git a/src/utils/validate.js b/src/utils/validate.js
index 9b5804f..34ffa06 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -89,6 +89,6 @@ export function isArray(arg) {
 
 // 密码规则：8-20位，必须包含字母、数字、特殊字符中的两种
 export function validPassword(str) {
-  const reg = /^((?=.*[A-Za-z])(?=.*\d)|(?=.*[A-Za-z])(?=.*[!@#$%^&*()_+\-\=])|(?=.*\d)(?=.*[!@#$%^&*()_+\-\=]))[A-Za-z\d!@#$%^&*()_+\-\=]{8,20}$/
+  const reg = /^(?!.*(?:111|888|123|234|345|456|567|678|789|1234|2345|3456|4567|5678|6789|12345|23456|34567|45678|56789|abc|abcd|abcde|abcdef|abcdefg|qwe|qwer|qwert|qwerty|asdf|asdfg|asdfgh|password|passw0rd|letmein|welcome|admin|user|test|pass|root|login))(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()_+{}\[\]:;"'|\\,.<>\/?~-]).{8,16}$/
   return reg.test(str)
 }
\ No newline at end of file
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 3973303..2e226c1 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -836,8 +836,10 @@ export default {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 closeOnClickModal: false,
-                inputPattern: /^.{5,20}$/,
-                inputErrorMessage: '用户密码长度必须介于 5 和 20 之间',
+                 inputPattern:
+                    /^(?!.*(?:111|888|123|234|345|456|567|678|789|1234|2345|3456|4567|5678|6789|12345|23456|34567|45678|56789|abc|abcd|abcde|abcdef|abcdefg|qwe|qwer|qwert|qwerty|asdf|asdfg|asdfgh|password|passw0rd|letmein|welcome|admin|user|test|pass|root|login))(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()_+{}\[\]:;"'|\\,.<>\/?~-]).{8,16}$/,
+                inputErrorMessage:
+                    '请设置8到16位，由字母、数字、特殊字符3种组合，且数字不可连续的密码',
             })
                 .then(({ value }) => {
                   const password = encrypt(value)
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 962e83a..796acca 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -1,83 +1,127 @@
 <template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item>
-  </el-form>
+    <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+        <el-form-item label="旧密码" prop="oldPassword">
+            <el-input
+                v-model="user.oldPassword"
+                placeholder="请输入旧密码"
+                type="password"
+                show-password
+            />
+        </el-form-item>
+        <el-form-item label="新密码" prop="newPassword">
+            <el-input
+                v-model="user.newPassword"
+                placeholder="请输入新密码"
+                type="password"
+                show-password
+            />
+        </el-form-item>
+        <el-form-item label="确认密码" prop="confirmPassword">
+            <el-input
+                v-model="user.confirmPassword"
+                placeholder="请确认新密码"
+                type="password"
+                show-password
+            />
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" size="mini" @click="submit"
+                >保存</el-button
+            >
+            <el-button type="danger" size="mini" @click="close">关闭</el-button>
+        </el-form-item>
+    </el-form>
 </template>
 
 <script>
-import { updateUserPwd } from "@/api/system/user";
+import { updateUserPwd } from '@/api/system/user'
 import { validPassword } from '@/utils/validate'
 import { encrypt } from '@/utils/jsencrypt.js'
 
 export default {
-  data() {
-    const passwordRegex = (rule, value, callback) => {
-      if (value.length < 8 || value.length > 20) {
-        callback(new Error("密码长度在 8 到 20 个字符"));
-      } else if (!validPassword(value)) {
-        callback(new Error("密码须包含数字、字母、特殊符号中的两种以上"));
-      } else if (this.user.oldPassword === value) {
-        callback(new Error('新密码不能与旧密码相同'))
-      } else {
-        callback()
-      }
-    }
-    const equalToPassword = (rule, value, callback) => {
-      if (this.user.newPassword !== value) {
-        callback(new Error("两次输入的密码不一致"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      user: {
-        oldPassword: undefined,
-        newPassword: undefined,
-        confirmPassword: undefined
-      },
-      // 表单校验
-      rules: {
-        oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
-        ],
-        newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { required: true, validator: passwordRegex, trigger: "blur" }
-        ],
-        confirmPassword: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
-        ]
-      }
-    };
-  },
-  methods: {
-    submit() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          const oldPassword = encrypt(this.user.oldPassword)
-          const newPassword = encrypt(this.user.newPassword)
-          updateUserPwd(oldPassword, newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功");
-          });
+    data() {
+        const passwordRegex = (rule, value, callback) => {
+            if (
+                value.length < 8 ||
+                value.length > 16 ||
+                !validPassword(value)
+            ) {
+                callback(
+                    new Error(
+                        '请设置8到16位，由字母、数字、特殊字符3种组合，且数字不可连续的密码',
+                    ),
+                )
+                return false
+            } else if (this.user.oldPassword === value) {
+                callback(new Error('新密码不能与旧密码相同'))
+            } else {
+                callback()
+            }
+        }
+        const equalToPassword = (rule, value, callback) => {
+            if (this.user.newPassword !== value) {
+                callback(new Error('两次输入的密码不一致'))
+            } else {
+                callback()
+            }
+        }
+        return {
+            user: {
+                oldPassword: undefined,
+                newPassword: undefined,
+                confirmPassword: undefined,
+            },
+            // 表单校验
+            rules: {
+                oldPassword: [
+                    {
+                        required: true,
+                        message: '旧密码不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                newPassword: [
+                    {
+                        required: true,
+                        message: '新密码不能为空',
+                        trigger: 'blur',
+                    },
+                    {
+                        required: true,
+                        validator: passwordRegex,
+                        trigger: 'blur',
+                    },
+                ],
+                confirmPassword: [
+                    {
+                        required: true,
+                        message: '确认密码不能为空',
+                        trigger: 'blur',
+                    },
+                    {
+                        required: true,
+                        validator: equalToPassword,
+                        trigger: 'blur',
+                    },
+                ],
+            },
         }
-      });
     },
-    close() {
-      this.$tab.closePage();
-    }
-  }
-};
+    methods: {
+        submit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const oldPassword = encrypt(this.user.oldPassword)
+                    const newPassword = encrypt(this.user.newPassword)
+                    updateUserPwd(oldPassword, newPassword).then((response) => {
+                        this.$modal.msgSuccess('修改成功')
+                    })
+                }
+            })
+        },
+        close() {
+            this.$tab.closePage()
+        },
+    },
+}
 </script>