From 8e506dc6e69529627a0aace6118f7310cc2f030a Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 24 Sep 2023 20:22:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=98=B5=E7=A7=B0?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charles7c/cnadmin/system/model/request/UserRequest.java | 2 +- .../src/views/system/user/center/components/basic-info.vue | 6 +----- .../src/views/system/user/center/locale/en-US.ts | 4 +--- .../src/views/system/user/center/locale/zh-CN.ts | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java index 9d9a1bf8..bd51c005 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java @@ -59,7 +59,7 @@ public class UserRequest extends BaseRequest { */ @Schema(description = "昵称", example = "张三") @NotBlank(message = "昵称不能为空") - @Pattern(regexp = "^[\\u4e00-\\u9fa5a-zA-Z0-9_-]{4,30}$", message = "昵称长度为 4 到 30 位，可以包含中文、字母、数字、下划线，短横线") + @Pattern(regexp = RegexConsts.GENERAL_NAME, message = "昵称长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线") private String nickname; /** diff --git a/continew-admin-ui/src/views/system/user/center/components/basic-info.vue b/continew-admin-ui/src/views/system/user/center/components/basic-info.vue index 7ff5f93f..eb078eb1 100644 --- a/continew-admin-ui/src/views/system/user/center/components/basic-info.vue +++ b/continew-admin-ui/src/views/system/user/center/components/basic-info.vue @@ -79,10 +79,6 @@ required: true, message: t('userCenter.basicInfo.form.error.required.username'), }, - { - match: /^[a-zA-Z][a-zA-Z0-9_]{3,15}$/, - message: t('userCenter.basicInfo.form.error.match.username'), - }, ], nickname: [ { @@ -90,7 +86,7 @@ message: t('userCenter.basicInfo.form.error.required.nickname'), }, { - match: /^[\u4e00-\u9fa5a-zA-Z0-9_-]{1,20}$/, + match: /^[\u4e00-\u9fa5a-zA-Z0-9_-]{2,30}$/, message: t('userCenter.basicInfo.form.error.match.nickname'), }, ], diff --git a/continew-admin-ui/src/views/system/user/center/locale/en-US.ts b/continew-admin-ui/src/views/system/user/center/locale/en-US.ts index 47677a7c..51dd7b27 100644 --- a/continew-admin-ui/src/views/system/user/center/locale/en-US.ts +++ b/continew-admin-ui/src/views/system/user/center/locale/en-US.ts @@ -25,11 +25,9 @@ export default { 'userCenter.basicInfo.form.placeholder.nickname': 'Please enter nickname', 'userCenter.basicInfo.form.error.required.username': 'Please enter username', - 'userCenter.basicInfo.form.error.match.username': - 'Username are 4 to 16 characters long and can contain letters, numbers, underscores, and start with a letter', 'userCenter.basicInfo.form.error.required.nickname': 'Please enter nickname', 'userCenter.basicInfo.form.error.match.nickname': - 'Nickname are 1 to 20 digits long and can contain Chinese, letters, numbers, underscores, dashes', + 'Nickname are 2 to 30 digits long and can contain Chinese, letters, numbers, underscores, dashes', 'userCenter.basicInfo.form.save': 'Save', 'userCenter.basicInfo.form.save.success': 'Save success', diff --git a/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts b/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts index bdb71407..8c2af29b 100644 --- a/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts +++ b/continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts @@ -25,11 +25,9 @@ export default { 'userCenter.basicInfo.form.placeholder.nickname': '请输入昵称', 'userCenter.basicInfo.form.error.required.username': '请输入用户名', - 'userCenter.basicInfo.form.error.match.username': - '长度为 4 到 16 位，可以包含字母、数字，下划线，以字母开头', 'userCenter.basicInfo.form.error.required.nickname': '请输入昵称', 'userCenter.basicInfo.form.error.match.nickname': - '长度为 1 到 20 位，可以包含中文、字母、数字、下划线，短横线', + '长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线', 'userCenter.basicInfo.form.save': '保存', 'userCenter.basicInfo.form.save.success': '保存成功',