架构升级springboot4

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>3.5.2</version>
+            <version>4.1.1</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -59,6 +59,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>org.jeecg.monitor.JeecgMonitorApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
         <resources>

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/java/org/jeecg/monitor/JeecgMonitorApplication.java

@@ -5,13 +5,12 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
- * 监控服务
+ * @author scott
- * @author zyf
- * @date: 2022/4/21 10:55
  */
 @SpringBootApplication
 @EnableAdminServer
 public class JeecgMonitorApplication {
+
     public static void main(String[] args) {
         SpringApplication.run(JeecgMonitorApplication.class, args);
     }

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/java/org/jeecg/monitor/config/SecuritySecureConfig.java

@@ -4,10 +4,14 @@ import de.codecentric.boot.admin.server.config.AdminServerProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.Customizer;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
-import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.server.SecurityWebFilterChain;
-import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.server.authentication.RedirectServerAuthenticationSuccessHandler;
-import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
+import org.springframework.security.web.server.authentication.ServerAuthenticationSuccessHandler;
+import org.springframework.security.web.server.authentication.logout.RedirectServerLogoutSuccessHandler;
+import org.springframework.security.web.server.authentication.logout.ServerLogoutSuccessHandler;
+
+import java.net.URI;
 
 /**
  * @author scott
@@ -15,49 +19,43 @@ import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 @Configuration
 public class SecuritySecureConfig {
 
-    private final String adminContextPath;
+    private final AdminServerProperties adminServer;
 
     public SecuritySecureConfig(AdminServerProperties adminServerProperties) {
-        this.adminContextPath = adminServerProperties.getContextPath();
+        this.adminServer = adminServerProperties;
     }
 
     @Bean
-    public SecurityFilterChain configure(HttpSecurity http) throws Exception {
+    public SecurityWebFilterChain configure(ServerHttpSecurity http) {
-        // 登录成功处理类
+        return http
-        SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
+            .authorizeExchange(authorize -> authorize
-        successHandler.setTargetUrlParameter("redirectTo");
+                .pathMatchers(adminServer.path("/assets/**")).permitAll()
-        successHandler.setDefaultTargetUrl(adminContextPath + "/");
+                .pathMatchers(adminServer.path("/login")).permitAll()
-
+                .pathMatchers("/actuator/health/**").permitAll()
-        http
+                .anyExchange().authenticated()
-            // authorizeRequests() 已废弃,使用 authorizeHttpRequests()
-            .authorizeHttpRequests(authorize -> authorize
-                //静态文件允许访问
-                .requestMatchers(adminContextPath + "/assets/**").permitAll()
-                //登录页面允许访问
-                .requestMatchers(adminContextPath + "/login", "/css/**", "/js/**", "/image/*").permitAll()
-                //其他所有请求需要登录
-                .anyRequest().authenticated()
             )
-            //登录页面配置，用于替换security默认页面
             .formLogin(formLogin -> formLogin
-                .loginPage(adminContextPath + "/login")
+                .loginPage(adminServer.path("/login"))
-                .successHandler(successHandler)
+                .authenticationSuccessHandler(loginSuccessHandler(adminServer.path("/")))
             )
-            //登出页面配置，用于替换security默认页面
             .logout(logout -> logout
-                .logoutUrl(adminContextPath + "/logout")
+                .logoutUrl(adminServer.path("/logout"))
+                .logoutSuccessHandler(logoutSuccessHandler(adminServer.path("/login?logout")))
             )
             .httpBasic(Customizer.withDefaults())
-            .csrf(csrf -> csrf
+            .csrf(ServerHttpSecurity.CsrfSpec::disable)
-                .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
+            .build();
-                .ignoringRequestMatchers(
-                    "/instances",
-                    "/actuator/**"
-                )
-            );
-
-        return http.build();
-
     }
 
+    private ServerAuthenticationSuccessHandler loginSuccessHandler(String uri) {
+        RedirectServerAuthenticationSuccessHandler handler = new RedirectServerAuthenticationSuccessHandler();
+        handler.setLocation(URI.create(uri));
+        return handler;
+    }
+
+    private ServerLogoutSuccessHandler logoutSuccessHandler(String uri) {
+        RedirectServerLogoutSuccessHandler handler = new RedirectServerLogoutSuccessHandler();
+        handler.setLogoutSuccessUrl(URI.create(uri));
+        return handler;
+    }
 }