solve conflict

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

@@ -33,33 +33,41 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestURI = request.getRequestURI();
-        String hostName = request.getHeader("Host");
-        String forwardedFor = request.getHeader("X-Forwarded-For");
-        String forwardedHost = request.getHeader("X-Forwarded-Host");
 //        //根据uri确认是否要拦截
         if (!shouldFilter(requestURI)){
             return true;
         }
-        String serverName = request.getServerName();
-        String remoteHost = request.getRemoteHost();
-        log.info("hostName: {}", hostName);
-        log.info("serverName: {}", serverName);
-        log.info("remoteHost: {}", remoteHost);
-        log.info("forwardedFor: {}", forwardedFor);
-        log.info("forwardedHost: {}", forwardedHost);
-        if (serverName.equals("iuav.mmcuav.cn") || serverName.equals("test.iuav.mmcuav.cn") || serverName.equals("www.iuav.shop") || serverName.equals("test.iuav.shop")){
-            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;
+        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;
         }
+//
+//        String serverName = request.getServerName();
+//        String remoteHost = request.getRemoteHost();
+//        log.info("hostName: {}", hostName);
+//        log.info("serverName: {}", serverName);
+//        log.info("remoteHost: {}", remoteHost);
+//        log.info("forwardedFor: {}", forwardedFor);
+//        log.info("forwardedHost: {}", forwardedHost);
+//        if (hostName.equals("iuav.mmcuav.cn") || hostName.equals("test.iuav.mmcuav.cn") || hostName.equals("www.iuav.shop") || hostName.equals("test.iuav.shop")){
+//            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/resources/not-check.yml

@@ -14,3 +14,4 @@ data-filter:
     - /userapp/temp-auth/getLoginInfo
     - /userapp/wx/getAppletQRCode
     - /userapp/wx/wxSendMessage
+    - /userapp/user-account/feignListUserAccountIds

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 365f6d809a860d7e669df9bb38e52e241b87451d
+  newTag: d1aada4cc1724c9071e1580f0bcec9cd2d4dc140