zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Charles7c 2023-09-24 20:22:46 +08:00
parent 4ef741a28e
commit 8e506dc6e6
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java
View File

@ -59,7 +59,7 @@ public class UserRequest extends BaseRequest {
*/ */
@Schema(description = "昵称", example = "张三") @Schema(description = "昵称", example = "张三")
@NotBlank(message = "昵称不能为空") @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; private String nickname;
/** /**

6
continew-admin-ui/src/views/system/user/center/components/basic-info.vue
View File

@ -79,10 +79,6 @@
required: true, required: true,
message: t('userCenter.basicInfo.form.error.required.username'), 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: [ nickname: [
{ {
@ -90,7 +86,7 @@
message: t('userCenter.basicInfo.form.error.required.nickname'), 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'), message: t('userCenter.basicInfo.form.error.match.nickname'),
}, },
], ],

4
continew-admin-ui/src/views/system/user/center/locale/en-US.ts
View File

@ -25,11 +25,9 @@ export default {
'userCenter.basicInfo.form.placeholder.nickname': 'Please enter nickname', 'userCenter.basicInfo.form.placeholder.nickname': 'Please enter nickname',
'userCenter.basicInfo.form.error.required.username': 'Please enter username', '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.required.nickname': 'Please enter nickname',
'userCenter.basicInfo.form.error.match.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': 'Save',
'userCenter.basicInfo.form.save.success': 'Save success', 'userCenter.basicInfo.form.save.success': 'Save success',

4
continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts
View File

@ -25,11 +25,9 @@ export default {
'userCenter.basicInfo.form.placeholder.nickname': '请输入昵称', 'userCenter.basicInfo.form.placeholder.nickname': '请输入昵称',
'userCenter.basicInfo.form.error.required.username': '请输入用户名', 'userCenter.basicInfo.form.error.required.username': '请输入用户名',
'userCenter.basicInfo.form.error.match.username':
'长度为 4 到 16 位，可以包含字母、数字，下划线，以字母开头',
'userCenter.basicInfo.form.error.required.nickname': '请输入昵称', 'userCenter.basicInfo.form.error.required.nickname': '请输入昵称',
'userCenter.basicInfo.form.error.match.nickname': 'userCenter.basicInfo.form.error.match.nickname':
'长度为 1 到 20 位，可以包含中文、字母、数字、下划线，短横线', '长度为 2 到 30 位，可以包含中文、字母、数字、下划线，短横线',
'userCenter.basicInfo.form.save': '保存', 'userCenter.basicInfo.form.save': '保存',
'userCenter.basicInfo.form.save.success': '保存成功', 'userCenter.basicInfo.form.save.success': '保存成功',