|
|
@@ -1,17 +1,13 @@
|
|
|
package cn.tr.plugin.security.filter;
|
|
|
-
|
|
|
import cn.dev33.satoken.exception.NotLoginException;
|
|
|
import cn.dev33.satoken.exception.NotPermissionException;
|
|
|
import cn.dev33.satoken.exception.NotRoleException;
|
|
|
-import cn.dev33.satoken.stp.StpLogic;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.tr.core.utils.ServletUtils;
|
|
|
import cn.tr.plugin.security.bo.UserLoginInfoBO;
|
|
|
-import cn.tr.plugin.security.constant.SecurityConstant;
|
|
|
import cn.tr.plugin.security.context.LoginUserContextHolder;
|
|
|
import org.springframework.web.util.NestedServletException;
|
|
|
-
|
|
|
import javax.servlet.*;
|
|
|
import java.io.IOException;
|
|
|
|
|
|
@@ -26,7 +22,9 @@ public class TrSaTokenFilter implements Filter {
|
|
|
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
|
|
|
if(StrUtil.isEmpty(LoginUserContextHolder.getStpType())){
|
|
|
UserLoginInfoBO user = LoginUserContextHolder.getUser();
|
|
|
- LoginUserContextHolder.setStpType( StrUtil.isEmpty(user.getLoginType())?StpUtil.TYPE:user.getLoginType());
|
|
|
+ if(ObjectUtil.isNotNull(user)){
|
|
|
+ LoginUserContextHolder.setStpType( StrUtil.isEmpty(user.getLoginType())?StpUtil.TYPE:user.getLoginType());
|
|
|
+ }
|
|
|
}
|
|
|
try {
|
|
|
filterChain.doFilter(servletRequest,servletResponse);
|
|
|
@@ -44,6 +42,5 @@ public class TrSaTokenFilter implements Filter {
|
|
|
}
|
|
|
throw e;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|