From 3e0d2d926bc84d67ac0545e6264774c97dbb8a67 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 22 Jun 2024 17:30:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0):=20=E6=9B=B4=E6=96=B0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=AD=96=E7=95=A5=EF=BC=9A=E5=AD=97=E6=AF=8D=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E3=80=81=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=BB=E6=84=8F2=E7=A7=8D=E7=BB=84=E6=88=90?=
 =?UTF-8?q?=EF=BC=8C6-20=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/reg.ts       | 4 ++--
 src/locales/langs/en-us.ts | 2 +-
 src/locales/langs/zh-cn.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/constants/reg.ts b/src/constants/reg.ts
index 8805ca8..a0c2be4 100644
--- a/src/constants/reg.ts
+++ b/src/constants/reg.ts
@@ -7,9 +7,9 @@ export const REG_PHONE =
 /**
  * Password reg
  *
- * 6-18 characters, including letters, numbers, and underscores
+ * 由字母、数字、特殊字符，任意2种组成，6-20位
  */
-export const REG_PWD = /^\w{6,18}$/;
+export const REG_PWD = /^(?![a-zA-Z]+$)(?!\d+$)(?![^\da-zA-Z\s]+$).{6,20}$/;
 
 /** Email reg */
 export const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index da4fd54..c2be41f 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -873,7 +873,7 @@ const local: App.I18n.Schema = {
     },
     pwd: {
       required: 'Please enter password',
-      invalid: '6-18 characters, including letters, numbers, and underscores'
+      invalid: 'Letters, numbers, and special characters, combination of two, 6 to 20 characters'
     },
     confirmPwd: {
       required: 'Please enter password again',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index f3bc9fc..f49e79a 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -881,7 +881,7 @@ const local: App.I18n.Schema = {
     },
     pwd: {
       required: '请输入密码',
-      invalid: '密码格式不正确，6-18位字符，包含字母、数字、下划线'
+      invalid: '由字母、数字、特殊字符，任意2种组成，6-20位'
     },
     confirmPwd: {
       required: '请输入确认密码',