拦截过滤

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/TokenCheckHandleInterceptor.java

@@ -31,23 +31,23 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestURI = request.getRequestURI();
-        String remoteHost = request.getRemoteHost();
-        System.out.println("remoteHost: " + remoteHost);
-        System.out.println("getServerName: " + request.getServerName());
 //        //根据uri确认是否要拦截
-//        if (!shouldFilter(requestURI)){
-//            return true;
-//        }
-//        String token = request.getHeader("token");
-//        String tokenJson = stringRedisTemplate.opsForValue().get(token);
-//
-//        if (request.getServerName().equals("iuav.mmcuav.cn")){
-//            if (StringUtils.isBlank(tokenJson)){
-//                exceptionProcess(response);
-//                return false;
-//            }
-//            return true;
-//        }
+        if (!shouldFilter(requestURI)){
+            return true;
+        }
+        if (request.getServerName().equals("iuav.mmcuav.cn") || request.getServerName().equals("test.iuav.mmcuav.cn")){
+            String token = request.getHeader("token");
+            if (StringUtils.isBlank(token)){
+                exceptionProcess(response);
+                return false;
+            }
+            String tokenJson = stringRedisTemplate.opsForValue().get(token);
+            if (StringUtils.isBlank(tokenJson)){
+                exceptionProcess(response);
+                return false;
+            }
+            return true;
+        }
         return true;
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/BaseController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.mmc.iuav.auth.JwtConstant;
 import com.mmc.iuav.auth.JwtUtil;
 import com.mmc.iuav.http.BizException;
+import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.model.dto.BaseAccountDTO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
@@ -13,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
 
 /**
  * @author: zj
@@ -46,8 +49,11 @@ public abstract class BaseController {
      * @param request
      * @return
      */
-    public LoginSuccessDTO getUserLoginInfoFromRedis(HttpServletRequest request) {
+    public LoginSuccessDTO getUserLoginInfoFromRedis(HttpServletRequest request){
         String token = request.getHeader("token");
+        if (StringUtils.isBlank(token)){
+            throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
+        }
         String json = stringRedisTemplate.opsForValue().get(token);
         if (StringUtils.isBlank(json)){
             throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);