From 7a6ab68171634b80172960f22d2771b12f168076 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Fri, 05 Jan 2024 14:32:46 +0800
Subject: [PATCH] 修改强密码
---
src/layout/components/Register/index.vue | 4 ++--
src/utils/request.js | 4 ++--
src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue | 2 +-
src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue | 2 +-
src/utils/validate.js | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/layout/components/Register/index.vue b/src/layout/components/Register/index.vue
index d9aa4f3..e284428 100644
--- a/src/layout/components/Register/index.vue
+++ b/src/layout/components/Register/index.vue
@@ -246,7 +246,7 @@
</el-row>
<el-row :gutter="30" v-if="state.title == '新增/注册'">
<el-col :span="12">
- <el-form-item prop="password" label="密码">
+ <el-form-item prop="password" label="密码(字母+数字+特殊字符，长度在6-16之间)">
<el-input
v-model.trim="registerForm.password"
type="password"
@@ -450,7 +450,7 @@
callback(new Error('请输入密码'))
}else{
if(!verifyPwd(value)){
- callback(new Error('密码须包含字母、数字、特殊字符(不包括下划线)，长度在6-16之间'))
+ callback(new Error('密码须包含字母、数字、特殊字符，长度在6-16之间'))
}else{
callback()
}
diff --git a/src/utils/request.js b/src/utils/request.js
index 6b3b29d..0d6d9b0 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -36,7 +36,7 @@
config.params = {};
config.url = url;
}
- if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+ if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put' || config.method === 'get')) {
const requestObj = {
url: config.url,
data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
@@ -56,7 +56,7 @@
const s_data = sessionObj.data; // 请求数据
const s_time = sessionObj.time; // 请求时间
const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
- if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+ if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url && s_url!=='/system/common/uploadFile') {
const message = '数据正在处理，请勿重复提交';
console.warn(`[${s_url}]: ` + message)
return Promise.reject(new Error(message))
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 00968b1..0a650f0 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -24,12 +24,12 @@
export function verifyUsername(val) {
// var regex = /^(?=.*[a-zA-Z])|(?=.*\d)[a-zA-Z\d]{5,16}$/; // 正则表达式，\d 匹配数字，{11} 表示匹配11次
var regex = /^[0-9a-zA-Z]{5,16}$/g
- return regex.test(val);
+ return regex.test(val)
}
export function verifyPwd(val) {
// false: 强密码不正确
- if (!/^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&\.*]+$)(?![a-zA-z\d]+$)(?![a-zA-z!@#$%^&\.*]+$)(?![\d!@#$%^&\.*]+$)[a-zA-Z\d!@#$%^&\.*]{6,16}$/.test(val)) return false;
+ if (!/^(?![a-zA-Z]+$)(?!\d+$)(?![!@#$%^&\.*]+$)(?![a-zA-Z\d]+$)(?![a-zA-Z!@#$%^&\.*]+$)(?![\d!@#$%^&\.*]+$)[a-zA-Z\d!@#$%^&\.*\-_]{6,16}$/.test(val)) return false;
// true: 强密码正确
else return true;
}
diff --git a/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
index 5f79b4b..dc08874 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
@@ -246,7 +246,7 @@
callback(new Error('请输入密码'))
}else{
if(!verifyPwd(value)){
- callback(new Error('密码须包含字母、数字、特殊字符(不包括下划线)，长度在6-16之间'))
+ callback(new Error('密码须包含字母、数字、特殊字符，长度在6-16之间'))
}else{
callback()
}
diff --git a/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue b/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
index 3396fab..4d8e5b7 100644
--- a/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
+++ b/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
@@ -134,7 +134,7 @@
callback(new Error('请输入密码'))
}else{
if(!verifyPwd(value)){
- callback(new Error('密码须包含字母、数字、特殊字符(不包括下划线)，长度在6-16之间'))
+ callback(new Error('密码须包含字母、数字、特殊字符，长度在6-16之间'))
}else{
callback()
}
--
Gitblit v1.9.2