dengyj před 4 roky
rodič
revize
14e33ad6d6

+ 12 - 22
src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -32,39 +32,29 @@ public class SecurityFilter implements Filter {
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         HttpServletResponse response = (HttpServletResponse) servletResponse;
         String path = request.getRequestURI();
-
+        String method = request.getMethod();
+        StringBuffer url = request.getRequestURL();
         //不拦截
         if ("/jgjl/v1/meterbasecars/appregister".equals(path)
                 ||"/jgjl/v1/meterbasecars/applogin".equals(path)){
             filterChain.doFilter(servletRequest,servletResponse);
             return;
         }
-
-//        if(request.getRemoteAddr().equals("10.104.4.105")) {
-//            filterChain.doFilter(servletRequest,servletResponse);
-//            return;
-//        }
-
-//        // 1. 先尝试拿vCode
-        StringBuffer url = request.getRequestURL();
-        String uri = request.getRequestURI();
-        String method = request.getMethod();
+        //邓义晶:10.104.4.105  app:10.1.201.188
+        //app:https://app.jiugang.com/jgjl/v1/meterbasecars/applogin
+        //网页代理ip:https://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1/meterbasecars/applogin
+        //本地:http://10.104.4.105:9004/v1/meterbasecars/applogin
+        if(request.getRemoteAddr().equals("10.1.201.188")) {
+            filterChain.doFilter(servletRequest,servletResponse);
+            return;
+        }
+        // 1. 先尝试拿vCode
         String vCode = request.getParameter("verificationCode");
-//        // 获取json字符串
+        // 获取json字符串
         if(vCode == null || StringUtils.isEmpty(vCode)) {
             vCode = request.getHeader("verificationCode");
         }
 
-////        String accept = request.getHeader("accept");
-          // String jsonStr = getJsonParam((HttpServletRequest) servletRequest);
-//        // 2. 如果vCode为空,且method为POST,且contentType[0]为application/json
-//        if(vCode == null || StringUtils.isEmpty(vCode)) {
-//            Object parse = JSON.parse(jsonStr);
-//            JSONObject object = new JSONObject(parse);
-//            vCode = object.getStr("verificationCode");
-//
-//        }
-
         //取出验证码
         if(vCode == null || StringUtils.isEmpty(vCode)) {
             response.setContentType("application/json;charset=UTF-8");