From 70ecc717c746eef0c4503a19031ada582f5e94d1 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 09 一月 2026 15:47:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java |   48 +++++++++++++++---------------------------------
 1 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java
index c663a60..3597e5f 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/config/WebMvcConfig.java
@@ -2,7 +2,9 @@
 
 
 import com.vincent.rsf.openApi.entity.constant.Constants;
+import com.vincent.rsf.openApi.security.filter.AppIdAuthenticationFilter;
 import com.vincent.rsf.openApi.utils.Http;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
@@ -23,36 +25,15 @@
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
+    @Autowired
+    private AppIdAuthenticationFilter appIdAuthenticationFilter;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(getAsyncHandlerInterceptor())
                 .addPathPatterns("/**")
                 .excludePathPatterns("/swagger-resources/**", "/webjars/**","/erp/**", "/v2/**","/v3/**","/doc.html/**", "/swagger-ui.html/**");
     }
-
-
-    @Bean
-    public AsyncHandlerInterceptor getAsyncHandlerInterceptor() {
-        return new AsyncHandlerInterceptor(){
-            @Override
-            public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-                Http.cors(response);
-                return true;
-            }
-        };
-    }
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
-        registry.addResourceHandler("swagger-ui.html")
-                .addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("doc.html")
-                .addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**")
-                .addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
@@ -66,13 +47,14 @@
     }
 
 
-    public static void cors(HttpServletResponse response){
-        // 璺ㄥ煙璁剧疆
-        response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Origin", "*");
-        response.setHeader("Access-Control-Allow-Methods", "*");
-        response.setHeader("Access-Control-Allow-Headers", "*");
-        response.setHeader("Access-Control-Expose-Headers", Constants.TOKEN_HEADER_NAME);
+    @Bean
+    public AsyncHandlerInterceptor getAsyncHandlerInterceptor() {
+        return new AsyncHandlerInterceptor(){
+            @Override
+            public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+                Http.cors(response);
+                return true;
+            }
+        };
     }
-
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1