From b7a1357c9bd63dfd715e34b3fc86b3a848e0a845 Mon Sep 17 00:00:00 2001 From: Sjh <55341701@qq.com> Date: Tue, 7 Nov 2023 09:35:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AF=86=E7=A0=81=E6=9C=80?= =?UTF-8?q?=E5=B0=8F=E9=95=BF=E5=BA=A612=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../change-password/change-password.component.ts | 4 ++-- src/app/pages/login/forget/forget.component.ts | 4 ++-- src/app/pages/login/login.component.ts | 4 ++-- src/app/service/pattern.service.ts | 11 +++++------ 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/app/pages/change-password/change-password.component.ts b/src/app/pages/change-password/change-password.component.ts index 2663989..29aa68c 100644 --- a/src/app/pages/change-password/change-password.component.ts +++ b/src/app/pages/change-password/change-password.component.ts @@ -34,7 +34,7 @@ export class MyValidators extends Validators { return null; } - return isPassword(value) ? null : { mobile: { 'zh-cn': PatternService.isProd ? `长度至少 8 位，必须包含大写字母、小写字母、数字、符号四种中的三种，且口令禁止包含 sinochem、sino、zhonghua (含大小写变体) 等中国中化相关字符` : '长度至少 8 位，必须包含大写字母、小写字母、数字、符号四种中的三种', en: `Password phone number is not valid` } }; + return isPassword(value) ? null : { mobile: { 'zh-cn': PatternService.isProd ? `长度至少 12 位，必须包含大写字母、小写字母、数字、符号四种中的三种，且口令禁止包含 sinochem、sino、zhonghua (含大小写变体) 等中国中化相关字符` : '长度至少 12 位，必须包含大写字母、小写字母、数字、符号四种中的三种', en: `Password phone number is not valid` } }; } } @@ -42,5 +42,5 @@ function isEmptyInputValue(value: NzSafeAny): boolean { return value == null || value.length === 0; } function isPassword(value: string): boolean { - return typeof value === 'string' && /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)(?!.*[sS][iI][nN][oO].*)(?!.*[zZ][hH][oO][nN][gG][hH][uU][aA].*)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{8,99}$/.test(value); + return typeof value === 'string' && /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)(?!.*[sS][iI][nN][oO].*)(?!.*[zZ][hH][oO][nN][gG][hH][uU][aA].*)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{12,99}$/.test(value); } diff --git a/src/app/pages/login/forget/forget.component.ts b/src/app/pages/login/forget/forget.component.ts index 4d3f834..1bab2e5 100644 --- a/src/app/pages/login/forget/forget.component.ts +++ b/src/app/pages/login/forget/forget.component.ts @@ -133,7 +133,7 @@ export class MyValidators extends Validators { return null; } - return isPassword(value) ? null : { mobile: { 'zh-cn': PatternService.isProd ? `长度至少 8 位，必须包含大写字母、小写字母、数字、符号四种中的三种，且口令禁止包含 sinochem、sino、zhonghua (含大小写变体) 等中国中化相关字符` : '长度至少 8 位，必须包含大写字母、小写字母、数字、符号四种中的三种', en: `Password phone number is not valid` } }; + return isPassword(value) ? null : { mobile: { 'zh-cn': PatternService.isProd ? `长度至少 12 位，必须包含大写字母、小写字母、数字、符号四种中的三种，且口令禁止包含 sinochem、sino、zhonghua (含大小写变体) 等中国中化相关字符` : '长度至少 12 位，必须包含大写字母、小写字母、数字、符号四种中的三种', en: `Password phone number is not valid` } }; } } @@ -141,5 +141,5 @@ function isEmptyInputValue(value: NzSafeAny): boolean { return value == null || value.length === 0; } function isPassword(value: string): boolean { - return typeof value === 'string' && /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)(?!.*[sS][iI][nN][oO].*)(?!.*[zZ][hH][oO][nN][gG][hH][uU][aA].*)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{8,99}$/.test(value); + return typeof value === 'string' && /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)(?!.*[sS][iI][nN][oO].*)(?!.*[zZ][hH][oO][nN][gG][hH][uU][aA].*)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{12,99}$/.test(value); } diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 3f36c37..381d2d0 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -261,7 +261,7 @@ export class MyValidators extends Validators { return null; } - return isPassword(value) ? null : { mobile: { 'zh-cn': `长度至少 8 位，必须包含大写字母、小写字母、数字、符号四种中的三种`, en: `Password phone number is not valid` } }; + return isPassword(value) ? null : { mobile: { 'zh-cn': `长度至少 12 位，必须包含大写字母、小写字母、数字、符号四种中的三种`, en: `Password phone number is not valid` } }; } } @@ -269,6 +269,6 @@ function isEmptyInputValue(value: NzSafeAny): boolean { return value == null || value.length === 0; } function isPassword(value: string): boolean { - return typeof value === 'string' && /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{8,99}$/.test(value); + return typeof value === 'string' && /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{12,99}$/.test(value); } diff --git a/src/app/service/pattern.service.ts b/src/app/service/pattern.service.ts index 813dfe3..3572f1b 100644 --- a/src/app/service/pattern.service.ts +++ b/src/app/service/pattern.service.ts @@ -1,13 +1,12 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; @Injectable({ - providedIn: 'root' + providedIn: "root", }) export class PatternService { - static isProd: any = true; + static isProd: any = false; - constructor() { } - - public isProd: boolean = true //是否是生产环境 + constructor() {} + public isProd: boolean = false; //是否是生产环境 }