From 8dfc4f80047add161703fd6443d699930b28ccbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BF=8A?= <873019219@qq.com>
Date: Mon, 20 Sep 2021 16:14:45 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=B7=A8=E5=9F=9F=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E8=BF=87=E6=BB=A4=E5=99=A8=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=87=AA=E6=B3=A8=E8=A7=A3=E6=B3=A8=E5=86=8C=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/im/zhaojun/zfile/config/ZFileConfiguration.java  | 8 --------
 src/main/java/im/zhaojun/zfile/filter/CorsFilter.java     | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/im/zhaojun/zfile/config/ZFileConfiguration.java b/src/main/java/im/zhaojun/zfile/config/ZFileConfiguration.java
index 6645af6..ddca344 100644
--- a/src/main/java/im/zhaojun/zfile/config/ZFileConfiguration.java
+++ b/src/main/java/im/zhaojun/zfile/config/ZFileConfiguration.java
@@ -39,12 +39,4 @@ public class ZFileConfiguration {
         return restTemplate;
     }
 
-    @Bean
-    public FilterRegistrationBean filterRegist() {
-        FilterRegistrationBean frBean = new FilterRegistrationBean();
-        frBean.setFilter(new CorsFilter());
-        frBean.addUrlPatterns("/*");
-        return frBean;
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/java/im/zhaojun/zfile/filter/CorsFilter.java b/src/main/java/im/zhaojun/zfile/filter/CorsFilter.java
index ffd847e..ecdf1f8 100644
--- a/src/main/java/im/zhaojun/zfile/filter/CorsFilter.java
+++ b/src/main/java/im/zhaojun/zfile/filter/CorsFilter.java
@@ -1,6 +1,8 @@
 package im.zhaojun.zfile.filter;
 
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
 import org.springframework.web.cors.CorsUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
@@ -8,6 +10,7 @@ import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -16,6 +19,9 @@ import java.io.IOException;
  * 开启跨域支持. 一般用于开发环境, 或前后端分离部署时开启.
  * @author zhaojun
  */
+@Order(1)
+@WebFilter(value = "/*")
+@Component
 public class CorsFilter extends GenericFilterBean {
 
     @Override