diff --git a/config/nacos/application-common.yml b/config/nacos/application-common.yml
index e295377f..bbd21499 100644
--- a/config/nacos/application-common.yml
+++ b/config/nacos/application-common.yml
@@ -91,7 +91,7 @@ spring:
# password:
database: 0
timeout: 10s
- ssl: false
+ ssl.enable: false
# redisson 配置
redisson:
diff --git a/pom.xml b/pom.xml
index cb2739c3..80ae326e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,24 +17,23 @@
UTF-8
UTF-8
17
- 3.0.8
- 2022.0.2
- 3.0.4
- 2.2.2
+ 3.1.2
+ 2022.0.4
+ 3.1.3
+ 3.0.2
3.5.10
3.5.3.1
3.9.1
- 4.1.1
+ 4.1.2
2.3
2.2.9
2.1.0
0.15.0
5.2.3
- 3.3.1
- 5.8.18
- 3.20.1
+ 3.3.2
+ 5.8.20
+ 3.23.1
2.2.4
- 2.4.0
4.3.3
1.35.0.RC
1.18.26
@@ -44,7 +43,7 @@
8.14.0
1.72
2.14.2
- 1.3.1
+ 1.3.5
0.2.0
1.16.5
@@ -56,7 +55,7 @@
1.2.83
- 1.12.400
+ 1.12.517
4.10.0
@@ -64,7 +63,7 @@
3.11.0
- 3.0.0
+ 3.1.2
1.3.0
diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
index 9ebb121a..804ccccb 100644
--- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
@@ -15,7 +15,7 @@
2.1.0-SNAPSHOT
- 2022.0.0.0-RC2
+ 2022.0.0.0
1.8.6
1.7.0
2.2.1
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java b/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java
index ff6f8e5d..686200b8 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java
+++ b/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java
@@ -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();
}
diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml
index 82ac6463..616ef385 100644
--- a/ruoyi-visual/ruoyi-nacos/pom.xml
+++ b/ruoyi-visual/ruoyi-nacos/pom.xml
@@ -29,7 +29,7 @@
2.2.1
- 2.7.12
+ 2.7.14
2.7.10
${project.basedir}/src/main/resources/lib
diff --git a/ruoyi-visual/ruoyi-powerjob-server/pom.xml b/ruoyi-visual/ruoyi-powerjob-server/pom.xml
index 181b07c5..8710dbc9 100644
--- a/ruoyi-visual/ruoyi-powerjob-server/pom.xml
+++ b/ruoyi-visual/ruoyi-powerjob-server/pom.xml
@@ -10,9 +10,9 @@
ruoyi-powerjob-server
- 2.7.12
+ 2.7.14
2021.0.7
- 2021.0.5.0
+ 2021.0.4.0
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
index 778912e3..b637bb45 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
@@ -15,9 +15,9 @@
1.8.6
4.0.1
- 2.7.12
+ 2.7.14
2021.0.7
- 2021.0.5.0
+ 2021.0.4.0