From f0470d33f99e4b8f455b7b26ebc08d8c9e08256c Mon Sep 17 00:00:00 2001 From: wangxiangshun Date: Sun, 26 Oct 2025 14:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A5=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/i18n/messages_en_US.properties | 4 ++-- .../src/main/resources/i18n/messages_zh_CN.properties | 3 ++- vetti-admin/target/classes/application-druid.yml | 2 +- .../main/java/com/vetti/common/core/domain/AjaxResult.java | 7 ++++--- .../vetti/framework/web/service/SysRegisterService.java | 3 +-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/vetti-admin/src/main/resources/i18n/messages_en_US.properties b/vetti-admin/src/main/resources/i18n/messages_en_US.properties index e32c468..b596e5b 100644 --- a/vetti-admin/src/main/resources/i18n/messages_en_US.properties +++ b/vetti-admin/src/main/resources/i18n/messages_en_US.properties @@ -47,14 +47,14 @@ systemSysRegisterService10001 = The username cannot be empty systemSysRegisterService10002 = User password cannot be empty systemSysRegisterService10003 = The account length must be between 2 and 20 characters systemSysRegisterService10004 = The password length must be between 5 and 20 characters -systemSysRegisterService10005 = Save User +systemSysRegisterService10005 = The account already exists and cannot be added repeatedly systemSysRegisterService10006 = Failed, registered account already exists systemSysRegisterService10007 = Registration failed, please contact the system administrator systemEmailUtil10001 = Sending Email Failed systemR10001 = Operation Successful - +systemR10002 = Operation Failed #管理端 # manager.页面,字段 = User Manager VerificationEmailTiTle = Your verification code diff --git a/vetti-admin/src/main/resources/i18n/messages_zh_CN.properties b/vetti-admin/src/main/resources/i18n/messages_zh_CN.properties index 056711f..8814c0f 100644 --- a/vetti-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/vetti-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -46,12 +46,13 @@ systemSysRegisterService10001 = 用户名不能为空 systemSysRegisterService10002 = 用户密码不能为空 systemSysRegisterService10003 = 账户长度必须在2到20个字符之间 systemSysRegisterService10004 = 密码长度必须在5到20个字符之间 -systemSysRegisterService10005 = 保存用户 +systemSysRegisterService10005 = 帐号已存在,无法重重添加 systemSysRegisterService10006 = 失败，注册账号已存在 systemSysRegisterService10007 = 注册失败,请联系系统管理人员 systemEmailUtil10001 = 发送邮件失败 systemR10001 = 操作成功 +systemR10002 = 操作失败 #管理端 # manager.页面,字段 = 用户管理 diff --git a/vetti-admin/target/classes/application-druid.yml b/vetti-admin/target/classes/application-druid.yml index d509fb0..5633fd3 100644 --- a/vetti-admin/target/classes/application-druid.yml +++ b/vetti-admin/target/classes/application-druid.yml @@ -146,7 +146,7 @@ verification: code: email: # 验证码长度 - length: 5 + length: 6 # 验证码过期时间（分钟） expiration-minutes: 10 # 文本转语音 diff --git a/vetti-common/src/main/java/com/vetti/common/core/domain/AjaxResult.java b/vetti-common/src/main/java/com/vetti/common/core/domain/AjaxResult.java index 12c5df9..92d17dd 100644 --- a/vetti-common/src/main/java/com/vetti/common/core/domain/AjaxResult.java +++ b/vetti-common/src/main/java/com/vetti/common/core/domain/AjaxResult.java @@ -5,6 +5,7 @@ import java.util.Objects; import cn.hutool.core.date.DateUtil; import com.vetti.common.constant.HttpStatus; +import com.vetti.common.utils.MessageUtils; import com.vetti.common.utils.StringUtils; /** @@ -93,7 +94,7 @@ public class AjaxResult extends HashMap */ public static AjaxResult success() { - return AjaxResult.success("操作成功"); + return AjaxResult.success(MessageUtils.messageCustomize("systemR10001")); } /** @@ -103,7 +104,7 @@ public class AjaxResult extends HashMap */ public static AjaxResult success(Object data) { - return AjaxResult.success("操作成功", data); + return AjaxResult.success(MessageUtils.messageCustomize("systemR10001"), data); } /** @@ -159,7 +160,7 @@ public class AjaxResult extends HashMap */ public static AjaxResult error() { - return AjaxResult.error("操作失败"); + return AjaxResult.error(MessageUtils.messageCustomize("systemR10002")); } /** diff --git a/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java b/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java index 0f25ba0..380163d 100644 --- a/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java +++ b/vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java @@ -90,8 +90,7 @@ public class SysRegisterService else if (!userService.checkUserNameUnique(sysUser)) { // msg = "保存用户'" + username + "'失败，注册账号已存在"; - throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10005")+username+ - MessageUtils.messageCustomize("systemSysRegisterService10006")); + throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10005")); } else {