diff --git a/tone-page-server/src/admin/dto/admin-user/create.dto.ts b/tone-page-server/src/admin/dto/admin-user/create.dto.ts index 2c998c6..42b2c36 100644 --- a/tone-page-server/src/admin/dto/admin-user/create.dto.ts +++ b/tone-page-server/src/admin/dto/admin-user/create.dto.ts @@ -3,12 +3,12 @@ import { IsString, Length, Matches, ValidateIf } from "class-validator"; export class CreateDto { @ValidateIf(o => o.username !== null) @IsString({ message: '用户名不得为空' }) - @Length(6, 32, { message: '用户名长度只能为6~32' }) + @Length(4, 32, { message: '用户名长度只能为4~32' }) username: string | null; @ValidateIf(o => o.nickname !== null) @IsString({ message: '昵称不得为空' }) - @Length(6, 30, { message: '昵称长度只能为6~30' }) + @Length(1, 30, { message: '昵称长度只能为1~30' }) nickname: string | null; @ValidateIf(o => o.email !== null) @@ -23,7 +23,9 @@ export class CreateDto { @ValidateIf(o => o.password !== null) @IsString({ message: '密码不得为空' }) - @Length(6, 32) - @Matches(/^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/) + @Length(6, 32, { message: '密码长度只能为6~32' }) + @Matches(/^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/, + { message: '密码必须包含字母和数字,且长度在6~32之间' } + ) password: string | null; } \ No newline at end of file diff --git a/tone-page-server/src/admin/dto/admin-user/update-password.dto.ts b/tone-page-server/src/admin/dto/admin-user/update-password.dto.ts index 2fac29c..6224bfa 100644 --- a/tone-page-server/src/admin/dto/admin-user/update-password.dto.ts +++ b/tone-page-server/src/admin/dto/admin-user/update-password.dto.ts @@ -1,8 +1,10 @@ import { IsString, Length, Matches } from "class-validator"; export class UpdatePasswordDto { - @IsString() - @Length(6, 32) - @Matches(/^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/) + @IsString({ message: '密码不得为空' }) + @Length(6, 32, { message: '密码长度只能为6~32' }) + @Matches(/^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/, + { message: '密码必须包含字母和数字,且长度在6~32之间' } + ) password: string; } \ No newline at end of file diff --git a/tone-page-server/src/admin/dto/admin-user/update.dto.ts b/tone-page-server/src/admin/dto/admin-user/update.dto.ts index 25c0d1a..bf8d841 100644 --- a/tone-page-server/src/admin/dto/admin-user/update.dto.ts +++ b/tone-page-server/src/admin/dto/admin-user/update.dto.ts @@ -2,11 +2,11 @@ import { IsEmail, IsOptional, IsString, Length, Matches } from "class-validator" export class UpdateDto { @IsString({ message: '用户名不得为空' }) - @Length(6, 32, { message: '用户名长度只能为6~32' }) + @Length(4, 32, { message: '用户名长度只能为4~32' }) username: string; @IsString({ message: '昵称不得为空' }) - @Length(6, 30, { message: '昵称长度只能为6~30' }) + @Length(1, 30, { message: '昵称长度只能为1~30' }) nickname: string; @IsOptional()