* 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

config/nacos/application-common.yml

@@ -91,7 +91,7 @@ spring:
       # password:
       database: 0
       timeout: 10s
-      ssl: false
+      ssl.enable: false
 
 # redisson 配置
 redisson:

pom.xml

@@ -17,24 +17,23 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot.version>3.0.8</spring-boot.version>
-        <spring-cloud.version>2022.0.2</spring-cloud.version>
-        <spring-boot-admin.version>3.0.4</spring-boot-admin.version>
-        <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
+        <spring-boot.version>3.1.2</spring-boot.version>
+        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-boot-admin.version>3.1.3</spring-boot-admin.version>
+        <spring-boot.mybatis>3.0.2</spring-boot.mybatis>
         <mybatis.version>3.5.10</mybatis.version>
         <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
-        <dynamic-ds.version>4.1.1</dynamic-ds.version>
+        <dynamic-ds.version>4.1.2</dynamic-ds.version>
         <velocity.version>2.3</velocity.version>
         <swagger.core.version>2.2.9</swagger.core.version>
         <springdoc.version>2.1.0</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <poi.version>5.2.3</poi.version>
-        <easyexcel.version>3.3.1</easyexcel.version>
-        <hutool.version>5.8.18</hutool.version>
-        <redisson.version>3.20.1</redisson.version>
+        <easyexcel.version>3.3.2</easyexcel.version>
+        <hutool.version>5.8.20</hutool.version>
+        <redisson.version>3.23.1</redisson.version>
         <lock4j.version>2.2.4</lock4j.version>
-        <xxl-job.version>2.4.0</xxl-job.version>
         <powerjob.version>4.3.3</powerjob.version>
         <satoken.version>1.35.0.RC</satoken.version>
         <lombok.version>1.18.26</lombok.version>
@@ -44,7 +43,7 @@
         <skywalking-toolkit.version>8.14.0</skywalking-toolkit.version>
         <bouncycastle.version>1.72</bouncycastle.version>
         <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
-        <mapstruct-plus.version>1.3.1</mapstruct-plus.version>
+        <mapstruct-plus.version>1.3.5</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
         <justauth.version>1.16.5</justauth.version>
         <!-- 离线IP地址定位库 -->
@@ -56,7 +55,7 @@
         <fastjson.version>1.2.83</fastjson.version>
 
         <!-- OSS 配置 -->
-        <aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
+        <aws-java-sdk-s3.version>1.12.517</aws-java-sdk-s3.version>
         <okhttp.version>4.10.0</okhttp.version>
 
         <!-- SMS 配置 -->
@@ -64,7 +63,7 @@
 
         <!-- 插件版本 -->
         <maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison>
-        <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
     </properties>
 

ruoyi-common/ruoyi-common-alibaba-bom/pom.xml

@@ -15,7 +15,7 @@
 
     <properties>
         <revision>2.1.0-SNAPSHOT</revision>
-        <spring-cloud-alibaba.version>2022.0.0.0-RC2</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <sentinel.version>1.8.6</sentinel.version>
         <seata.version>1.7.0</seata.version>
         <nacos.client.version>2.2.1</nacos.client.version>

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();
     }
 

ruoyi-visual/ruoyi-nacos/pom.xml

@@ -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>

ruoyi-visual/ruoyi-powerjob-server/pom.xml

@@ -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>

ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml

@@ -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>