|
|
@ -68,8 +68,7 @@ public class LoginHelper {
|
|
|
|
// } else if (userType == UserType.APP_USER) {
|
|
|
|
// } else if (userType == UserType.APP_USER) {
|
|
|
|
// model.setTimeout(86400).setActiveTimeout(1800);
|
|
|
|
// model.setTimeout(86400).setActiveTimeout(1800);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
StpUtil.stpLogic.setLoginType(loginUser.getUserType())
|
|
|
|
StpUtil.login(loginUser.getLoginId(),
|
|
|
|
.login(loginUser.getLoginId(),
|
|
|
|
|
|
|
|
model.setExtra(TENANT_KEY, loginUser.getTenantId())
|
|
|
|
model.setExtra(TENANT_KEY, loginUser.getTenantId())
|
|
|
|
.setExtra(USER_KEY, loginUser.getUserId()));
|
|
|
|
.setExtra(USER_KEY, loginUser.getUserId()));
|
|
|
|
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
|
|
|
|
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
|
|
|
@ -155,7 +154,7 @@ public class LoginHelper {
|
|
|
|
* 获取用户类型
|
|
|
|
* 获取用户类型
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public static UserType getUserType() {
|
|
|
|
public static UserType getUserType() {
|
|
|
|
String loginType = StpUtil.stpLogic.getLoginType();
|
|
|
|
String loginType = StpUtil.getLoginIdAsString();
|
|
|
|
return UserType.getUserType(loginType);
|
|
|
|
return UserType.getUserType(loginType);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|