fix: 修复昵称正则不一致问题

continew-org · Sep 24, 2023 · 8e506dc · 8e506dc
1 parent 4ef741a
commit 8e506dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/...ew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java b/...ew-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
@@ -79,18 +79,14 @@
  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: [
  {
  required: true,
  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
@@ -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
@@ -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': '保存成功',