fix: 导入用户时密码规则和实际不一致

--bug=1007319 --user=lyh 导入用户时密码规则和实际不一致
https://www.tapd.cn/55049933/s/1057678
This commit is contained in:
shiziyuan9527 2021-10-22 15:46:22 +08:00 committed by shiziyuan9527
parent f638fc4742
commit da47fe6a08
4 changed files with 4 additions and 4 deletions

View File

@ -33,7 +33,7 @@ public class UserExcelDataCn extends UserExcelData {
@Length(max = 255) @Length(max = 255)
@ExcelProperty("密码") @ExcelProperty("密码")
@ColumnWidth(30) @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; private String password;
@ExcelProperty("电话") @ExcelProperty("电话")

View File

@ -33,7 +33,7 @@ public class UserExcelDataTw extends TestCaseExcelData {
@Length(max = 255) @Length(max = 255)
@ExcelProperty("密碼") @ExcelProperty("密碼")
@ColumnWidth(30) @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; private String password;
@ExcelProperty("電話") @ExcelProperty("電話")

View File

@ -34,7 +34,7 @@ public class UserExcelDataUs extends UserExcelData {
@Length(max = 255) @Length(max = 255)
@ExcelProperty("Password") @ExcelProperty("Password")
@ColumnWidth(30) @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; private String password;
@ExcelProperty("Phone") @ExcelProperty("Phone")

View File

@ -153,7 +153,7 @@ export default {
{required: true, message: this.$t('user.input_password'), trigger: 'blur'}, {required: true, message: this.$t('user.input_password'), trigger: 'blur'},
{ {
required: true, 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'), message: this.$t('member.password_format_is_incorrect'),
trigger: 'blur' trigger: 'blur'
} }