* update springboot 3.0.8 => 3.1.2

* update springcloud 2022.0.2 => 2022.0.4
* update springcloud-alibaba 2022.0.0.0-RC2 => 2022.0.0.0
* update spring-mybatis 3.0.1 => 3.0.2
* update easyexcel 3.3.1 => 3.3.2
* update hutool 5.8.18 => 5.8.20
* update redisson 3.20.1 => 3.23.1
* update dynamic-ds 4.1.1 => 4.1.2
* update mapstruct-plus 1.3.1 => 1.3.5
* update aws-java-sdk-s3 1.12.400 => 1.12.517
* update maven-surefire-plugin 3.0.0 => 3.1.2
This commit is contained in:
疯狂的狮子Li
2023-07-28 15:40:52 +08:00
parent f3125d245c
commit d5eb323a25
7 changed files with 38 additions and 35 deletions

View File

@@ -3,10 +3,14 @@ package org.dromara.modules.monitor.config;
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.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
/**
* admin 监控 安全配置
@@ -30,22 +34,22 @@ public class WebSecurityConfigurer {
successHandler.setDefaultTargetUrl(adminContextPath + "/");
return httpSecurity
.headers().frameOptions().disable()
.and().authorizeHttpRequests()
.requestMatchers(adminContextPath + "/assets/**"
, adminContextPath + "/login"
, "/actuator"
, "/actuator/**"
).permitAll()
.anyRequest().authenticated()
.and()
.formLogin().loginPage(adminContextPath + "/login")
.successHandler(successHandler).and()
.logout().logoutUrl(adminContextPath + "/logout")
.and()
.httpBasic().and()
.csrf()
.disable()
.headers((header) ->
header.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable))
.authorizeHttpRequests((authorize) ->
authorize.requestMatchers(
new AntPathRequestMatcher(adminContextPath + "/assets/**"),
new AntPathRequestMatcher(adminContextPath + "/login"),
new AntPathRequestMatcher("/actuator"),
new AntPathRequestMatcher("/actuator/**")
).permitAll()
.anyRequest().authenticated())
.formLogin((formLogin) ->
formLogin.loginPage(adminContextPath + "/login").successHandler(successHandler))
.logout((logout) ->
logout.logoutUrl(adminContextPath + "/logout"))
.httpBasic(Customizer.withDefaults())
.csrf(AbstractHttpConfigurer::disable)
.build();
}

View File

@@ -29,7 +29,7 @@
<properties>
<nacos.version>2.2.1</nacos.version>
<!-- 需要与 Nacos 内置 Boot 版本保持一致 -->
<spring-boot.version>2.7.12</spring-boot.version>
<spring-boot.version>2.7.14</spring-boot.version>
<spring-boot-admin.version>2.7.10</spring-boot-admin.version>
<nacos.lib.path>${project.basedir}/src/main/resources/lib</nacos.lib.path>
</properties>

View File

@@ -10,9 +10,9 @@
<artifactId>ruoyi-powerjob-server</artifactId>
<properties>
<spring-boot.version>2.7.12</spring-boot.version>
<spring-boot.version>2.7.14</spring-boot.version>
<spring-cloud.version>2021.0.7</spring-cloud.version>
<spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
<spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
</properties>
<dependencyManagement>
<dependencies>

View File

@@ -15,9 +15,9 @@
<properties>
<sentinel.version>1.8.6</sentinel.version>
<curator.version>4.0.1</curator.version>
<spring-boot.version>2.7.12</spring-boot.version>
<spring-boot.version>2.7.14</spring-boot.version>
<spring-cloud.version>2021.0.7</spring-cloud.version>
<spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
<spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
</properties>
<dependencyManagement>