From c94566f1d9c3df5aca3018b79f9db33e7d6683ef Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Mon, 25 Mar 2024 10:27:23 +0800 Subject: [PATCH] 1123 --- .../main/java/com/bashi/com/UserDetailsServiceImpl.java | 9 +++++---- bashi-admin/src/main/resources/i18n/messages.properties | 6 ++++++ .../src/main/resources/i18n/messages_en_US.properties | 6 ++++++ .../src/main/resources/i18n/messages_hi_IN.properties | 5 +++++ .../src/main/resources/i18n/messages_zh_CN.properties | 6 ++++++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/bashi-admin/src/main/java/com/bashi/com/UserDetailsServiceImpl.java b/bashi-admin/src/main/java/com/bashi/com/UserDetailsServiceImpl.java index 18a171e..1120009 100644 --- a/bashi-admin/src/main/java/com/bashi/com/UserDetailsServiceImpl.java +++ b/bashi-admin/src/main/java/com/bashi/com/UserDetailsServiceImpl.java @@ -8,6 +8,7 @@ import com.bashi.common.core.domain.model.LoginUser; import com.bashi.common.enums.UserStatus; import com.bashi.common.exception.BaseException; import com.bashi.common.exception.CustomException; +import com.bashi.common.utils.MessageUtils; import com.bashi.dk.service.CustomerService; import com.bashi.framework.security.sms.IDuteUserDetailsService; import com.bashi.framework.security.sms.LoginTypeEnums; @@ -81,7 +82,7 @@ public class UserDetailsServiceImpl implements IDuteUserDetailsService { @Override public UserDetails loadUserByMobile(LoginPhoneBody body) throws UsernameNotFoundException { if(body == null){ - throw new CustomException("账号不存在，登陆失败"); + throw new CustomException(MessageUtils.message("login.user.none")); } String mobile = body.getMobile(); Customer customer = null; @@ -89,15 +90,15 @@ public class UserDetailsServiceImpl implements IDuteUserDetailsService { customer = customerService.getCustomerByName(mobile); if(customer == null || !passwordEncoder.matches(body.getPassword(),customer.getPassword())){ log.info("登录用户：{} 用户名不存在或者密码错误", mobile); - throw new BaseException("对不起，用户名不存在或者密码错误"); + throw new BaseException(MessageUtils.message("login.user.fail")); } } if (customer == null){ log.info("登录用户：{} 不存在.", mobile); - throw new UsernameNotFoundException("登录用户：" + mobile + " 不存在"); + throw new UsernameNotFoundException(MessageUtils.message("login.user.not",mobile)); } else if (customer.getStatus() == 1) { log.info("登录用户：{} 已被停用.", mobile); - throw new BaseException("对不起，您的账号：" + mobile + " 已停用"); + throw new BaseException(MessageUtils.message("login.user.stop",mobile)); } return createCustomerUser(customer); } diff --git a/bashi-admin/src/main/resources/i18n/messages.properties b/bashi-admin/src/main/resources/i18n/messages.properties index 75a9b6d..c513da9 100644 --- a/bashi-admin/src/main/resources/i18n/messages.properties +++ b/bashi-admin/src/main/resources/i18n/messages.properties @@ -35,6 +35,12 @@ no.delete.permission=\u60A8\u6CA1\u6709\u5220\u9664\u6570\u636E\u7684\u6743\u965 no.export.permission=\u60A8\u6CA1\u6709\u5BFC\u51FA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.view.permission=\u60A8\u6CA1\u6709\u67E5\u770B\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] +login.user.none=\u8D26\u53F7\u4E0D\u5B58\u5728\uFF0C\u767B\u9646\u5931\u8D25 +login.user.fail=\u5BF9\u4E0D\u8D77\uFF0C\u7528\u6237\u540D\u4E0D\u5B58\u5728\u6216\u8005\u5BC6\u7801\u9519\u8BEF +login.user.not=\u767B\u5F55\u7528\u6237\uFF1A{0}\u4E0D\u5B58\u5728 +login.user.stop=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\uFF1A{0} \u5DF2\u505C\u7528 + + test=\u6D4B\u8BD5\u8BED\u8A00 dk.code.error=\u9A8C\u8BC1\u7801\u9519\u8BEF dk.password.update.error=\u5BC6\u7801\u4FEE\u6539\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u83B7\u53D6\u9A8C\u8BC1\u7801\u64CD\u4F5C diff --git a/bashi-admin/src/main/resources/i18n/messages_en_US.properties b/bashi-admin/src/main/resources/i18n/messages_en_US.properties index 2f7fc51..59a1226 100644 --- a/bashi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/bashi-admin/src/main/resources/i18n/messages_en_US.properties @@ -35,6 +35,12 @@ no.delete.permission=You do not have permission to delete data. Please contact t no.export.permission=You do not have permission to export data. Please contact the administrator to add permissions [{0}] no.view.permission=You do not have permission to view data. Please contact the administrator to add permissions [{0}] +login.user.none=Account does not exist, login failed +login.user.fail=Sorry, the username does not exist or the password is wrong +login.user.not=Login user: {0} does not exist +login.user.stop=Sorry, your account: {0} is deactivated + + test=Test Language dk.code.error=Incorrect code dk.password.update.error=Password update failed. Please retry with the correct verification code diff --git a/bashi-admin/src/main/resources/i18n/messages_hi_IN.properties b/bashi-admin/src/main/resources/i18n/messages_hi_IN.properties index 5cc8b0d..917490a 100644 --- a/bashi-admin/src/main/resources/i18n/messages_hi_IN.properties +++ b/bashi-admin/src/main/resources/i18n/messages_hi_IN.properties @@ -34,6 +34,11 @@ no.delete.permission=\u0906\u092A\u0915\u0947 \u092A\u093E\u0938 \u0921\u0947\u0 no.export.permission=\u0906\u092A\u0915\u0947 \u092A\u093E\u0938 \u0921\u0947\u091F\u093E \u0915\u094B \u0928\u093F\u0930\u094D\u092F\u093E\u0924 \u0915\u0930\u0928\u0947 \u0915\u0940 \u0905\u0928\u0941\u092E\u0924\u093F \u0928\u0939\u0940\u0902 \u0939\u0948, \u0915\u0943\u092A\u092F\u093E \u092A\u094D\u0930\u092C\u0902\u0927\u0915 \u0938\u0947 \u0905\u0928\u0941\u092E\u0924\u093F \u091C\u094B\u0921\u093C\u0928\u0947 \u0915\u0947 \u0932\u093F\u090F \u0938\u0902\u092A\u0930\u094D\u0915 \u0915\u0930\u0947\u0902 [{0}] no.view.permission=\u0906\u092A\u0915\u0947 \u092A\u093E\u0938 \u0921\u0947\u091F\u093E \u0926\u0947\u0916\u0928\u0947 \u0915\u0940 \u0905\u0928\u0941\u092E\u0924\u093F \u0928\u0939\u0940\u0902 \u0939\u0948, \u0915\u0943\u092A\u092F\u093E \u092A\u094D\u0930\u092C\u0902\u0927\u0915 \u0938\u0947 \u0905\u0928\u0941\u092E\u0924\u093F \u091C\u094B\u0921\u093C\u0928\u0947 \u0915\u0947 \u0932\u093F\u090F \u0938\u0902\u092A\u0930\u094D\u0915 \u0915\u0930\u0947\u0902 [{0}] +login.user.none=\u8D26\u53F7\u4E0D\u5B58\u5728\uFF0C\u767B\u9646\u5931\u8D25 +login.user.fail=\u5BF9\u4E0D\u8D77\uFF0C\u7528\u6237\u540D\u4E0D\u5B58\u5728\u6216\u8005\u5BC6\u7801\u9519\u8BEF +login.user.not=\u767B\u5F55\u7528\u6237\uFF1A{0}\u4E0D\u5B58\u5728 +login.user.stop=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\uFF1A{0} \u5DF2\u505C\u7528 + test=\u092D\u093E\u0937\u093E \u092A\u0930\u0940\u0915\u094D\u0937\u0923 dk.code.error=\u0915\u094B\u0921 \u0917\u0932\u0924 \u0939\u0948 dk.password.update.error=\u092A\u093E\u0938\u0935\u0930\u094D\u0921 \u0905\u092A\u0921\u0947\u091F \u0935\u093F\u092B\u0932, \u0915\u0943\u092A\u092F\u093E \u092A\u0941\u0928\u0903 \u0915\u094B\u0921 \u092A\u094D\u0930\u093E\u092A\u094D\u0924 \u0915\u0930\u0928\u0947 \u0915\u0940 \u0915\u094D\u0930\u093F\u092F\u093E \u0915\u0930\u0947\u0902 diff --git a/bashi-admin/src/main/resources/i18n/messages_zh_CN.properties b/bashi-admin/src/main/resources/i18n/messages_zh_CN.properties index 75a9b6d..c513da9 100644 --- a/bashi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/bashi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -35,6 +35,12 @@ no.delete.permission=\u60A8\u6CA1\u6709\u5220\u9664\u6570\u636E\u7684\u6743\u965 no.export.permission=\u60A8\u6CA1\u6709\u5BFC\u51FA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] no.view.permission=\u60A8\u6CA1\u6709\u67E5\u770B\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}] +login.user.none=\u8D26\u53F7\u4E0D\u5B58\u5728\uFF0C\u767B\u9646\u5931\u8D25 +login.user.fail=\u5BF9\u4E0D\u8D77\uFF0C\u7528\u6237\u540D\u4E0D\u5B58\u5728\u6216\u8005\u5BC6\u7801\u9519\u8BEF +login.user.not=\u767B\u5F55\u7528\u6237\uFF1A{0}\u4E0D\u5B58\u5728 +login.user.stop=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\uFF1A{0} \u5DF2\u505C\u7528 + + test=\u6D4B\u8BD5\u8BED\u8A00 dk.code.error=\u9A8C\u8BC1\u7801\u9519\u8BEF dk.password.update.error=\u5BC6\u7801\u4FEE\u6539\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u83B7\u53D6\u9A8C\u8BC1\u7801\u64CD\u4F5C