拦截过滤

csf-common/csf-common-util/src/main/java/com/mmc/csf/common/util/web/ResultEnum.java

@@ -44,7 +44,7 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     PARAM_DEFECT("5004", "参数缺失"),
     LOGIN_ACCOUNT_NOT_EXIT_ERROR("5005", "账号不存在"),
     LOGIN_PASSWORD_ERROR("5006", "密码错误"),
-    LOGIN_ACCOUNT_STATUS_ERROR("5008", "外部访问"),
+    LOGIN_ACCOUNT_STATUS_ERROR("5008", "未登录"),
     OPERATE_USER_ORDERCOUNT_ERROR("5007", "当前账号有存在相关订单未关闭"),
     WALLET_CASH_NOT_ENOUGH_ERROR("5009", "现金余额不足"),
 

release-service/src/main/java/com/mmc/csf/release/auth/TokenCheckHandleInterceptor.java

@@ -3,6 +3,7 @@ package com.mmc.csf.release.auth;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.common.util.web.ResultEnum;
 import com.mmc.csf.release.util.PathUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
@@ -29,24 +30,23 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         // 扫码登录还没做好，暂时先注释
-//        String requestURI = request.getRequestURI();
-//        //根据uri确认是否要拦截
-//        if (!shouldFilter(requestURI)){
-//            return true;
-//        }
-//        String token = request.getHeader("token");
-//        String tokenJson = stringRedisTemplate.opsForValue().get(token);
-//
-//        if (StringUtils.isBlank(tokenJson)){
-//            exceptionProcess(response);
-//            return false;
-//        }
-//        LoginSuccessDTO loginSuccessDTO = JSONObject.parseObject(tokenJson, LoginSuccessDTO.class);
-//        if (loginSuccessDTO != null){
-//            request.setAttribute("userAccountId", loginSuccessDTO.getUserAccountId());
-//        }
-
-        //test
+        String requestURI = request.getRequestURI();
+        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;
     }
 

release-service/src/main/java/com/mmc/csf/release/controller/BaseController.java

@@ -44,9 +44,12 @@ public abstract class BaseController {
      */
     public LoginSuccessDTO getUserLoginInfoFromRedis(HttpServletRequest request) {
         String token = request.getHeader("token");
+        if (StringUtils.isBlank(token)){
+            return null;
+        }
         String json = stringRedisTemplate.opsForValue().get(token);
         if (StringUtils.isBlank(json)){
-            return null;
+            throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
         }
         LoginSuccessDTO loginSuccessDTO = JSONObject.parseObject(json, LoginSuccessDTO.class);
         return loginSuccessDTO;