tianwu.sun 9 月之前
父节点
当前提交
4e0fb14c3d

+ 1 - 1
src/main/java/com/bootdo/common/controller/DictController.java

@@ -208,7 +208,7 @@ public class DictController extends BaseController {
 	}
 
 	/**
-	 * 所属行业
+	 * 获取系统省份
 	 *
 	 * @return
 	 */

+ 25 - 21
src/main/java/com/bootdo/system/config/AuthorizationInterceptor.java

@@ -4,6 +4,7 @@ import com.bootdo.common.token.Token;
 import com.bootdo.common.token.TokenUtil;
 import com.bootdo.common.utils.IPUtils;
 import com.bootdo.common.utils.ShiroUtils;
+import com.bootdo.system.domain.UserDO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
@@ -33,30 +34,33 @@ public class AuthorizationInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         try {
-            String username = ShiroUtils.getUser().getUsername();
-            if(ObjectUtils.isEmpty(username)){
-                return true;
-            }
-            String cacheToken =  tokenUtil.getLoginUser(username);
-            if(ObjectUtils.isEmpty(cacheToken)) {
-                logger.error("preHandle =====================cacheToken is null=======================A");
-                return true;
-            }
-            String tokenStr = cacheToken.split("_")[0];
+            UserDO userDO = ShiroUtils.getUser();
+            if(!ObjectUtils.isEmpty(userDO)){
+                String username = ShiroUtils.getUser().getUsername();
+                if(ObjectUtils.isEmpty(username)){
+                    return true;
+                }
+                String cacheToken =  tokenUtil.getLoginUser(username);
+                if(ObjectUtils.isEmpty(cacheToken)) {
+                    logger.error("preHandle =====================cacheToken is null=======================A");
+                    return true;
+                }
+                String tokenStr = cacheToken.split("_")[0];
 
-            Token token = tokenUtil.getToken(tokenStr);
-            if (ObjectUtils.isEmpty(token)) {
-                logger.error("preHandle =====================token is null=======================B");
-                return true;
-            }
+                Token token = tokenUtil.getToken(tokenStr);
+                if (ObjectUtils.isEmpty(token)) {
+                    logger.error("preHandle =====================token is null=======================B");
+                    return true;
+                }
 
-            String ip = null;
-            try {
-                ip = IPUtils.getIpAddr(request);
-            } catch (Exception e){
-                e.printStackTrace();
+                String ip = null;
+                try {
+                    ip = IPUtils.getIpAddr(request);
+                } catch (Exception e){
+                    e.printStackTrace();
+                }
+                tokenUtil.saveLoginUser(username, tokenStr, ip, System.currentTimeMillis(),"1");
             }
-            tokenUtil.saveLoginUser(username, tokenStr, ip, System.currentTimeMillis(),"1");
 
         } catch (Exception e) {
             e.printStackTrace();