|
@@ -4,10 +4,12 @@ import cc.iotkit.common.constant.TenantConstants;
|
|
|
import cc.iotkit.common.constant.UserConstants;
|
|
|
import cc.iotkit.common.enums.DeviceType;
|
|
|
import cc.iotkit.common.enums.UserType;
|
|
|
+import cc.iotkit.common.exception.BizException;
|
|
|
import cc.iotkit.common.undefined.LoginUser;
|
|
|
import cn.dev33.satoken.context.SaHolder;
|
|
|
import cn.dev33.satoken.context.model.SaStorage;
|
|
|
import cn.dev33.satoken.exception.InvalidContextException;
|
|
|
+import cn.dev33.satoken.session.SaSession;
|
|
|
import cn.dev33.satoken.stp.SaLoginModel;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
@@ -76,7 +78,11 @@ public class LoginHelper {
|
|
|
if (loginUser != null) {
|
|
|
return loginUser;
|
|
|
}
|
|
|
- loginUser = (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
|
|
|
+ SaSession tokenSession = StpUtil.getTokenSession();
|
|
|
+ if(tokenSession == null){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ loginUser = (LoginUser) tokenSession.get(LOGIN_USER_KEY);
|
|
|
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
|
|
|
return loginUser;
|
|
|
}
|