From 9e911460b0336c62df6308cc69ed57798e8864ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 30 Jul 2025 12:13:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-528=20app=E7=AB=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/auth/controller/AppController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java index f98bf7e3..10f27903 100644 --- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java +++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java @@ -63,10 +63,6 @@ public class AppController extends ControllerBase { .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage())); VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState())) .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED, MultilingualUtil.getLanguage())); - SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig - .setExtra("from", Constant.FROM_ADMIN) - .setExtra("name", adminUser.getUserName()) - .setExtra("email", adminUser.getEmail())); List roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId()); SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig .setExtra("from", Constant.FROM_ADMIN) @@ -74,11 +70,16 @@ public class AppController extends ControllerBase { .setExtra("code", adminUser.getUserCode()) .setExtra("email", adminUser.getEmail()) .setExtra("roles", roleCodes.stream().map(RoleVO::getCode).collect(Collectors.toList()))); + String adminToken=SaTokenAdminUtil.getTokenInfo().getTokenValue(); + SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig + .setExtra("from", Constant.FROM_ADMIN) + .setExtra("name", adminUser.getUserName()) + .setExtra("email", adminUser.getEmail())); SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo(); return ApiResult.success(new AppLoginVO() .setUserId(adminUser.getId()) .setToken(tokenInfo.getTokenValue()) - .setAdminToken(SaTokenAdminUtil.getTokenInfo().getTokenValue()) + .setAdminToken(adminToken) .setExpire(tokenInfo.getTokenTimeout()) .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE) .setPlatform(Constant.FROM_ADMIN));