feat: bug-528 app端添加管理功能
This commit is contained in:
parent
5b74e604ab
commit
ad50d8cc15
|
|
@ -9,16 +9,11 @@ import com.nflg.mobilebroken.common.constant.UserState;
|
||||||
import com.nflg.mobilebroken.common.pojo.ApiResult;
|
import com.nflg.mobilebroken.common.pojo.ApiResult;
|
||||||
import com.nflg.mobilebroken.common.pojo.vo.AppLoginVO;
|
import com.nflg.mobilebroken.common.pojo.vo.AppLoginVO;
|
||||||
import com.nflg.mobilebroken.common.pojo.vo.MenuVO;
|
import com.nflg.mobilebroken.common.pojo.vo.MenuVO;
|
||||||
import com.nflg.mobilebroken.common.util.AppUserUtil;
|
import com.nflg.mobilebroken.common.pojo.vo.RoleVO;
|
||||||
import com.nflg.mobilebroken.common.util.MultilingualUtil;
|
import com.nflg.mobilebroken.common.util.*;
|
||||||
import com.nflg.mobilebroken.common.util.SaTokenAppUtil;
|
|
||||||
import com.nflg.mobilebroken.common.util.VUtils;
|
|
||||||
import com.nflg.mobilebroken.repository.entity.AdminUser;
|
import com.nflg.mobilebroken.repository.entity.AdminUser;
|
||||||
import com.nflg.mobilebroken.repository.entity.AppUser;
|
import com.nflg.mobilebroken.repository.entity.AppUser;
|
||||||
import com.nflg.mobilebroken.repository.service.IAdminRoleService;
|
import com.nflg.mobilebroken.repository.service.*;
|
||||||
import com.nflg.mobilebroken.repository.service.IAdminUserService;
|
|
||||||
import com.nflg.mobilebroken.repository.service.IAppUserService;
|
|
||||||
import com.nflg.mobilebroken.repository.service.IDictionaryItemTranslateService;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
@ -50,6 +45,10 @@ public class AppController extends ControllerBase {
|
||||||
@Resource
|
@Resource
|
||||||
private IAdminRoleService adminRoleService;
|
private IAdminRoleService adminRoleService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IAdminUserRoleMapService adminUserRoleMapService;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户端登录
|
* 用户端登录
|
||||||
* @param userName 用户名
|
* @param userName 用户名
|
||||||
|
|
@ -68,10 +67,18 @@ public class AppController extends ControllerBase {
|
||||||
.setExtra("from", Constant.FROM_ADMIN)
|
.setExtra("from", Constant.FROM_ADMIN)
|
||||||
.setExtra("name", adminUser.getUserName())
|
.setExtra("name", adminUser.getUserName())
|
||||||
.setExtra("email", adminUser.getEmail()));
|
.setExtra("email", adminUser.getEmail()));
|
||||||
|
List<RoleVO> 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())));
|
||||||
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())
|
||||||
.setExpire(tokenInfo.getTokenTimeout())
|
.setExpire(tokenInfo.getTokenTimeout())
|
||||||
.setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE)
|
.setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE)
|
||||||
.setPlatform(Constant.FROM_ADMIN));
|
.setPlatform(Constant.FROM_ADMIN));
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,11 @@ public class AppLoginVO {
|
||||||
|
|
||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 管理员端token
|
||||||
|
*/
|
||||||
|
private String adminToken;
|
||||||
|
|
||||||
private Long expire;
|
private Long expire;
|
||||||
|
|
||||||
//语言编码
|
//语言编码
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue