feat: bug-528 app端添加管理功能
This commit is contained in:
parent
ad50d8cc15
commit
9e911460b0
|
|
@ -63,10 +63,6 @@ public class AppController extends ControllerBase {
|
||||||
.throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage()));
|
.throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage()));
|
||||||
VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState()))
|
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()));
|
.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<RoleVO> roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId());
|
List<RoleVO> roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId());
|
||||||
SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig
|
SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig
|
||||||
.setExtra("from", Constant.FROM_ADMIN)
|
.setExtra("from", Constant.FROM_ADMIN)
|
||||||
|
|
@ -74,11 +70,16 @@ public class AppController extends ControllerBase {
|
||||||
.setExtra("code", adminUser.getUserCode())
|
.setExtra("code", adminUser.getUserCode())
|
||||||
.setExtra("email", adminUser.getEmail())
|
.setExtra("email", adminUser.getEmail())
|
||||||
.setExtra("roles", roleCodes.stream().map(RoleVO::getCode).collect(Collectors.toList())));
|
.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();
|
SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo();
|
||||||
return ApiResult.success(new AppLoginVO()
|
return ApiResult.success(new AppLoginVO()
|
||||||
.setUserId(adminUser.getId())
|
.setUserId(adminUser.getId())
|
||||||
.setToken(tokenInfo.getTokenValue())
|
.setToken(tokenInfo.getTokenValue())
|
||||||
.setAdminToken(SaTokenAdminUtil.getTokenInfo().getTokenValue())
|
.setAdminToken(adminToken)
|
||||||
.setExpire(tokenInfo.getTokenTimeout())
|
.setExpire(tokenInfo.getTokenTimeout())
|
||||||
.setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE)
|
.setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE)
|
||||||
.setPlatform(Constant.FROM_ADMIN));
|
.setPlatform(Constant.FROM_ADMIN));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue