From c2013a8fb1d0a5a38b9ae3512d8a74eb5511ecff Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 22 Oct 2021 15:46:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=B6=E5=AF=86=E7=A0=81=E8=A7=84=E5=88=99=E5=92=8C=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1007319 --user=lyh 导入用户时密码规则和实际不一致
https://www.tapd.cn/55049933/s/1057678
---
 .../main/java/io/metersphere/excel/domain/UserExcelDataCn.java  | 2 +-
 .../main/java/io/metersphere/excel/domain/UserExcelDataTw.java  | 2 +-
 .../main/java/io/metersphere/excel/domain/UserExcelDataUs.java  | 2 +-
 frontend/src/business/components/settings/system/EditUser.vue   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataCn.java b/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataCn.java
index a396b42d9c..d7ea6f4958 100644
--- a/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataCn.java
+++ b/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataCn.java
@@ -33,7 +33,7 @@ public class UserExcelDataCn extends UserExcelData {
     @Length(max = 255)
     @ExcelProperty("密码")
     @ColumnWidth(30)
-    @Pattern(regexp = "^(?![0-9]+$)(?![^0-9]+$)(?![a-zA-Z]+$)(?![^a-zA-Z]+$)(?![a-zA-Z0-9]+$)[a-zA-Z0-9\\S]{8,30}$", message = "{user_import_format_wrong}")
+    @Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[\\s\\S]{8,30}$", message = "{user_import_format_wrong}")
     private String password;
 
     @ExcelProperty("电话")
diff --git a/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataTw.java b/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataTw.java
index 5a4dc4c804..8cdde42ef9 100644
--- a/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataTw.java
+++ b/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataTw.java
@@ -33,7 +33,7 @@ public class UserExcelDataTw extends TestCaseExcelData {
     @Length(max = 255)
     @ExcelProperty("密碼")
     @ColumnWidth(30)
-    @Pattern(regexp = "^(?![0-9]+$)(?![^0-9]+$)(?![a-zA-Z]+$)(?![^a-zA-Z]+$)(?![a-zA-Z0-9]+$)[a-zA-Z0-9\\S]{8,30}$", message = "{user_import_format_wrong}")
+    @Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[\\s\\S]{8,30}$", message = "{user_import_format_wrong}")
     private String password;
 
     @ExcelProperty("電話")
diff --git a/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataUs.java b/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataUs.java
index 7cd75a84ad..0bba263b27 100644
--- a/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataUs.java
+++ b/backend/src/main/java/io/metersphere/excel/domain/UserExcelDataUs.java
@@ -34,7 +34,7 @@ public class UserExcelDataUs extends UserExcelData {
     @Length(max = 255)
     @ExcelProperty("Password")
     @ColumnWidth(30)
-    @Pattern(regexp = "^(?![0-9]+$)(?![^0-9]+$)(?![a-zA-Z]+$)(?![^a-zA-Z]+$)(?![a-zA-Z0-9]+$)[a-zA-Z0-9\\S]{8,30}$", message = "{user_import_format_wrong}")
+    @Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[\\s\\S]{8,30}$", message = "{user_import_format_wrong}")
     private String password;
 
     @ExcelProperty("Phone")
diff --git a/frontend/src/business/components/settings/system/EditUser.vue b/frontend/src/business/components/settings/system/EditUser.vue
index 8d10d95c68..7727cd1ccf 100644
--- a/frontend/src/business/components/settings/system/EditUser.vue
+++ b/frontend/src/business/components/settings/system/EditUser.vue
@@ -153,7 +153,7 @@ export default {
           {required: true, message: this.$t('user.input_password'), trigger: 'blur'},
           {
             required: true,
-            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,30}$/,
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[\s\S]{8,30}$/,
             message: this.$t('member.password_format_is_incorrect'),
             trigger: 'blur'
           }