From 86df03e86a50afddeab1e8770c7762958098d8f8 Mon Sep 17 00:00:00 2001
From: lwoo <2629910752@qq.com>
Date: Fri, 11 Oct 2024 15:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E7=A6=81=E6=B7=BB=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/accompany/core/enumeration/I18nAlertEnum.java     | 3 +++
 .../oauth2/service/MyUserDetailsServiceImpl.java          | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java
index a47012473..a42083b48 100644
--- a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java
+++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/I18nAlertEnum.java
@@ -235,6 +235,9 @@ public enum I18nAlertEnum {
 
     PRETTY_NUMBER_EXAMINE_PASS("审核成功：您在靓号活动中申请的靓号:{0}已通过，后续可以以靓号+密码进行登录"),
     PRETTY_NUMBER_EXAMINE_REJECT("审核失败：你在靓号活动中申请的靓号:{0}不通过，可回原页面重新选择"),
+
+    ACCOUNT_LOGIN_BLOCK_MSG("{0}已被封禁，請聯絡官方客服。"),
+    ACCOUNT_LOGIN_UNBLOCK_DATE_MSG("解绑时间：{0}。"),
     ;
 
     private final String defaultStr;
diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java
index ba43dbdde..3885931c7 100644
--- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java
+++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java
@@ -20,6 +20,7 @@ import com.accompany.core.service.region.RegionNetworkService;
 import com.accompany.core.service.region.RegionService;
 import com.accompany.core.service.user.PhoneBlackService;
 import com.accompany.core.service.user.UsersBaseService;
+import com.accompany.core.util.I18NMessageSourceUtil;
 import com.accompany.oauth2.constant.LoginTypeEnum;
 import com.accompany.oauth2.exception.CustomOAuth2Exception;
 import com.accompany.oauth2.model.AccountDetails;
@@ -43,6 +44,8 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import static com.accompany.core.enumeration.I18nAlertEnum.ACCOUNT_LOGIN_BLOCK_MSG;
+
 @Slf4j
 public class MyUserDetailsServiceImpl implements MyUserDetailsService {
 
@@ -179,8 +182,9 @@ public class MyUserDetailsServiceImpl implements MyUserDetailsService {
         //检查账号、设备号、号段是否封禁
         if (null != blockEndTime){
             CustomOAuth2Exception exception = new CustomOAuth2Exception(CustomOAuth2Exception.ACCOUNT_ERROR, "");
-            exception.addAdditionalInformation("reason", "违规（请联系客服WeChat:sd245376）");
-            exception.addAdditionalInformation("date", String.valueOf(blockEndTime));
+            Integer partitionId = users.getPartitionId();
+            exception.addAdditionalInformation("reason", I18NMessageSourceUtil.getMessage(ACCOUNT_LOGIN_BLOCK_MSG, new Object[]{users.getErbanNo()}, partitionId));
+            exception.addAdditionalInformation("date", I18NMessageSourceUtil.getMessage(ACCOUNT_LOGIN_BLOCK_MSG, new Object[]{String.valueOf(blockEndTime)}, partitionId));
             throw exception;
         }