From 47793b7c905f2bcdf8c2034d82a5415722c89a8f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 22 九月 2020 18:21:23 +0800
Subject: [PATCH] 升级oshi到最新版本v5.2.5

---
 src/main/java/com/ruoyi/framework/config/SecurityConfig.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index b27b165..b78ee04 100644
--- a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -12,6 +12,8 @@
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.authentication.logout.LogoutFilter;
+import org.springframework.web.filter.CorsFilter;
 import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
 import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
@@ -49,6 +51,12 @@
     private JwtAuthenticationTokenFilter authenticationTokenFilter;
     
     /**
+     * 璺ㄥ煙杩囨护鍣�
+     */
+    @Autowired
+    private CorsFilter corsFilter;
+    
+    /**
      * 瑙e喅 鏃犳硶鐩存帴娉ㄥ叆 AuthenticationManager
      *
      * @return
@@ -80,7 +88,7 @@
     protected void configure(HttpSecurity httpSecurity) throws Exception
     {
         httpSecurity
-                // CRSF绂佺敤锛屽洜涓轰笉浣跨敤session
+                // CSRF绂佺敤锛屽洜涓轰笉浣跨敤session
                 .csrf().disable()
                 // 璁よ瘉澶辫触澶勭悊绫�
                 .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
@@ -112,9 +120,11 @@
         httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);
         // 娣诲姞JWT filter
         httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
+        // 娣诲姞CORS filter
+        httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
+        httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
     }
 
-    
     /**
      * 寮烘暎鍒楀搱甯屽姞瀵嗗疄鐜�
      */

--
Gitblit v1.9.3