Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java

@@ -22,6 +22,7 @@ public class CorsFilter implements Filter {
         res.addHeader("Access-Control-Allow-Credentials", "true");
         res.addHeader("Access-Control-Allow-Origin", ((HttpServletRequest) request).getHeader("origin"));
         res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+        res.addHeader("Access-Control-Allow-Headers", "Content-Type,X-CAF-Authorization-Token,sessionToken,X-TOKEN,token");
         res.addHeader("X-Frame-Options", "SAMEORIGIN");
         res.addHeader("Access-Control-Allow-Headers", "Content-Type,X-CAF-Authorization-Token,sessionToken,X-TOKEN");
         if (((HttpServletRequest) request).getMethod().equals("OPTIONS")) {

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java

@@ -58,6 +58,6 @@ public class ResourcesConfig implements WebMvcConfigurer
 //        registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
         registry.addInterceptor(new JWTInterceptor())
                 .addPathPatterns("/app/**")
-                .excludePathPatterns("/app/thirdLogin/doLogin", "/appLogin");// 除了登录放行，其他接口都token验证
+                .excludePathPatterns("/app/thirdLogin/siqLogin", "/appLogin");// 除了登录放行，其他接口都token验证
     }
 }