From dd5a118ecca452993c7b3817097f862dfdd46314 Mon Sep 17 00:00:00 2001
From: Jie Zheng <201507802@qq.com>
Date: Tue, 21 Jan 2025 16:06:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=EF=B8=8F=E6=9B=B4=E6=96=B0Spr?=
 =?UTF-8?q?ing=20Boot=E7=89=88=E6=9C=AC=E8=87=B32.7.18=E5=B9=B6=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E5=AE=89=E5=85=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                         |  2 +-
 eladmin/README.md                                 |  2 +-
 .../main/java/me/zhengjie/base/BaseEntity.java    |  2 +-
 .../security/config/SpringSecurityConfig.java     | 15 +++++++--------
 eladmin/pom.xml                                   |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index ab2d6a7..690d347 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <h1 style="text-align: center">ELADMIN 后台管理系统</h1>
 
 #### 项目简介
-一个基于 Spring Boot 2.6.6 、 Mybatis-Plus、 JWT、Spring Security、Redis、Vue的前后端分离的后台管理系统
+一个基于 Spring Boot 2.7.18 、 Mybatis-Plus、 JWT、Spring Security、Redis、Vue的前后端分离的后台管理系统
 
 **开发文档：**  [https://eladmin.vip](https://eladmin.vip)
 
diff --git a/eladmin/README.md b/eladmin/README.md
index ab2d6a7..690d347 100644
--- a/eladmin/README.md
+++ b/eladmin/README.md
@@ -1,7 +1,7 @@
 <h1 style="text-align: center">ELADMIN 后台管理系统</h1>
 
 #### 项目简介
-一个基于 Spring Boot 2.6.6 、 Mybatis-Plus、 JWT、Spring Security、Redis、Vue的前后端分离的后台管理系统
+一个基于 Spring Boot 2.7.18 、 Mybatis-Plus、 JWT、Spring Security、Redis、Vue的前后端分离的后台管理系统
 
 **开发文档：**  [https://eladmin.vip](https://eladmin.vip)
 
diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java
index f13026e..2afca20 100644
--- a/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java
+++ b/eladmin/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java
@@ -31,7 +31,7 @@ import java.sql.Timestamp;
 /**
  * 通用字段， is_del 根据需求自行添加
  * @author Zheng Jie
- * @Date 2019年10月24日20:46:32
+ * @date 2019年10月24日20:46:32
  */
 @Getter
 @Setter
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java
index ba9e684..f085281 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java
@@ -26,12 +26,11 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.core.GrantedAuthorityDefaults;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.web.filter.CorsFilter;
 import java.util.*;
 
@@ -39,10 +38,9 @@ import java.util.*;
  * @author Zheng Jie
  */
 @Configuration
-@EnableWebSecurity
 @RequiredArgsConstructor
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
-public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
+public class SpringSecurityConfig {
 
     private final TokenProvider tokenProvider;
     private final CorsFilter corsFilter;
@@ -64,11 +62,11 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
         return new BCryptPasswordEncoder();
     }
 
-    @Override
-    protected void configure(HttpSecurity httpSecurity) throws Exception {
+    @Bean
+    protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
         // 获取匿名标记
         Map<String, Set<String>> anonymousUrls = AnonTagUtils.getAnonymousUrl(applicationContext);
-        httpSecurity
+        return httpSecurity
                 // 禁用 CSRF
                 .csrf().disable()
                 .addFilter(corsFilter)
@@ -123,7 +121,8 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers(anonymousUrls.get(RequestMethodEnum.ALL.getType()).toArray(new String[0])).permitAll()
                 // 所有请求都需要认证
                 .anyRequest().authenticated()
-                .and().apply(securityConfigurerAdapter());
+                .and().apply(securityConfigurerAdapter())
+                .and().build();
     }
 
     private TokenConfigurer securityConfigurerAdapter() {
diff --git a/eladmin/pom.xml b/eladmin/pom.xml
index 51d462f..a5455af 100644
--- a/eladmin/pom.xml
+++ b/eladmin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.6</version>
+        <version>2.7.18</version>
     </parent>
 
     <properties>