Pre Merge pull request !201 from 板砖/master

pom.xml

@@ -12,6 +12,7 @@
     <url>http://www.ruoyi.vip</url>
     <description>若依微服务系统</description>
 
+
     <properties>
         <ruoyi.version>3.5.0</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java

@@ -1,9 +1,10 @@
 package com.ruoyi.modules.monitor.config;
 
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 
 /**
@@ -11,8 +12,8 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti
  * 
  * @author ruoyi
  */
-@Configuration
+@EnableWebSecurity
-public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter
+public class WebSecurityConfigurer
 {
     private final String adminContextPath;
 
@@ -21,14 +22,14 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter
         this.adminContextPath = adminServerProperties.getContextPath();
     }
 
-    @Override
+    @Bean
-    protected void configure(HttpSecurity http) throws Exception
+    public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception
     {
         SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
         successHandler.setTargetUrlParameter("redirectTo");
         successHandler.setDefaultTargetUrl(adminContextPath + "/");
 
-        http
+        return httpSecurity
                 .headers().frameOptions().disable()
                 .and().authorizeRequests()
                 .antMatchers(adminContextPath + "/assets/**"
@@ -44,6 +45,7 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter
                 .and()
                 .httpBasic().and()
                 .csrf()
-            .disable();
+                .disable()
+                .build();
     }
 }