From da854f9c383a7bdf98b82cea814af2f3a1a45319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 8 Aug 2025 15:05:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-558=20=E7=99=BB=E5=BD=95=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E6=9C=8D=E5=8A=A1=E7=B3=BB=E7=BB=9FPC=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=EF=BC=8C=E6=88=96APP=E7=AB=AF=E3=80=82?= =?UTF-8?q?=E4=BC=98=E5=85=88=E5=8F=96=E4=BB=A3=E7=90=86=E5=95=86=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=BB=A5=E4=BB=A3=E7=90=86=E5=95=86=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E4=B8=BA=E5=87=86=E3=80=82=E6=B2=A1=E6=9C=89=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E5=95=86=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=86=8D=E5=8F=96?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=86=85=E9=83=A8=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/AppController.java | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 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 10f27903..da5972ad 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 @@ -57,34 +57,8 @@ public class AppController extends ControllerBase { */ @GetMapping("login") public ApiResult login(String userName, String password) { - AdminUser adminUser =adminUserService.getUser(userName,password); - if (Objects.nonNull(adminUser)){ - VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.Disabled.getState())) - .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())); - List roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId()); - SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig - .setExtra("from", Constant.FROM_ADMIN) - .setExtra("name", adminUser.getUserName()) - .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(adminToken) - .setExpire(tokenInfo.getTokenTimeout()) - .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE) - .setPlatform(Constant.FROM_ADMIN)); - }else { - AppUser user=appUserService.getUser(userName,password); + AppUser user = appUserService.getUser(userName, password); + if (Objects.nonNull(user)) { VUtils.trueThrow(Objects.equals(user.getState(), UserState.Disabled.getState())) .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, user.getLanguageCode())); VUtils.trueThrow(Objects.equals(user.getState(), UserState.ToBeActivated.getState())) @@ -108,6 +82,32 @@ public class AppController extends ControllerBase { .setExpire(tokenInfo.getTokenTimeout()) .setLanguageCode(user.getLanguageCode()) .setPlatform(Constant.FROM_APP)); + } else { + AdminUser adminUser = adminUserService.getUser(userName, password); + VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.Disabled.getState())) + .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())); + List roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId()); + SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig + .setExtra("from", Constant.FROM_ADMIN) + .setExtra("name", adminUser.getUserName()) + .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(adminToken) + .setExpire(tokenInfo.getTokenTimeout()) + .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE) + .setPlatform(Constant.FROM_ADMIN)); } }