update springboot 3.4.7 => 3.5.4

update springboot-admin 3.4.7 => 3.5.1
update springdoc 2.8.8 => 2.8.9
update lombok 1.18.36 => 1.18.38

pom.xml

@@ -14,12 +14,12 @@
 
     <properties>
         <revision>5.4.1</revision>
-        <spring-boot.version>3.4.7</spring-boot.version>
+        <spring-boot.version>3.5.4</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
         <mybatis.version>3.5.16</mybatis.version>
-        <springdoc.version>2.8.8</springdoc.version>
+        <springdoc.version>2.8.9</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <fastexcel.version>1.2.0</fastexcel.version>
         <velocity.version>2.3</velocity.version>
@@ -27,14 +27,14 @@
         <mybatis-plus.version>3.5.12</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <hutool.version>5.8.38</hutool.version>
-        <spring-boot-admin.version>3.4.7</spring-boot-admin.version>
+        <spring-boot-admin.version>3.5.1</spring-boot-admin.version>
         <redisson.version>3.50.0</redisson.version>
         <lock4j.version>2.2.7</lock4j.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
         <snailjob.version>1.6.0</snailjob.version>
         <mapstruct-plus.version>1.4.8</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
-        <lombok.version>1.18.36</lombok.version>
+        <lombok.version>1.18.38</lombok.version>
         <bouncycastle.version>1.80</bouncycastle.version>
         <justauth.version>1.16.7</justauth.version>
         <!-- 离线IP地址定位库 -->
@@ -118,25 +118,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- Warm-Flow国产工作流引擎, 在线文档：http://warm-flow.cn/ -->
-            <dependency>
-                <groupId>org.dromara.warm</groupId>
-                <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
-                <version>${warm-flow.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.dromara.warm</groupId>
-                <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
-                <version>${warm-flow.version}</version>
-            </dependency>
-
-            <!-- JustAuth 的依赖配置-->
-            <dependency>
-                <groupId>me.zhyd.oauth</groupId>
-                <artifactId>JustAuth</artifactId>
-                <version>${justauth.version}</version>
-            </dependency>
-
             <!-- common 的依赖配置-->
             <dependency>
                 <groupId>org.dromara</groupId>
@@ -313,6 +294,25 @@
                 <version>${mapstruct-plus.version}</version>
             </dependency>
 
+            <!-- Warm-Flow国产工作流引擎, 在线文档：http://warm-flow.cn/ -->
+            <dependency>
+                <groupId>org.dromara.warm</groupId>
+                <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
+                <version>${warm-flow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.dromara.warm</groupId>
+                <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
+                <version>${warm-flow.version}</version>
+            </dependency>
+
+            <!-- JustAuth 的依赖配置-->
+            <dependency>
+                <groupId>me.zhyd.oauth</groupId>
+                <artifactId>JustAuth</artifactId>
+                <version>${justauth.version}</version>
+            </dependency>
+
             <!-- 离线IP地址定位库 ip2region -->
             <dependency>
                 <groupId>org.lionsoul</groupId>

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java

@@ -6,6 +6,7 @@ import org.dromara.common.encrypt.properties.ApiDecryptProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistration;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 
@@ -20,13 +21,14 @@ import org.springframework.context.annotation.Bean;
 public class ApiDecryptAutoConfiguration {
 
     @Bean
-    public FilterRegistrationBean<CryptoFilter> cryptoFilterRegistration(ApiDecryptProperties properties) {
+    @FilterRegistration(
-        FilterRegistrationBean<CryptoFilter> registration = new FilterRegistrationBean<>();
+        name = "cryptoFilter",
-        registration.setDispatcherTypes(DispatcherType.REQUEST);
+        urlPatterns = "/*",
-        registration.setFilter(new CryptoFilter(properties));
+        order = FilterRegistrationBean.HIGHEST_PRECEDENCE,
-        registration.addUrlPatterns("/*");
+        dispatcherTypes = DispatcherType.REQUEST
-        registration.setName("cryptoFilter");
+    )
-        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
+    public CryptoFilter cryptoFilter(ApiDecryptProperties properties) {
-        return registration;
+        return new CryptoFilter(properties);
     }
+
 }

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java

@@ -7,6 +7,7 @@ import org.dromara.common.web.filter.XssFilter;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistration;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 
@@ -21,24 +22,20 @@ public class FilterConfig {
 
     @Bean
     @ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
-    public FilterRegistrationBean<XssFilter> xssFilterRegistration() {
+    @FilterRegistration(
-        FilterRegistrationBean<XssFilter> registration = new FilterRegistrationBean<>();
+        name = "xssFilter",
-        registration.setDispatcherTypes(DispatcherType.REQUEST);
+        urlPatterns = "/*",
-        registration.setFilter(new XssFilter());
+        order = FilterRegistrationBean.HIGHEST_PRECEDENCE + 1,
-        registration.addUrlPatterns("/*");
+        dispatcherTypes = DispatcherType.REQUEST
-        registration.setName("xssFilter");
+    )
-        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE + 1);
+    public XssFilter xssFilter() {
-        return registration;
+        return new XssFilter();
     }
 
     @Bean
-    public FilterRegistrationBean<RepeatableFilter> someFilterRegistration() {
+    @FilterRegistration(name = "repeatableFilter", urlPatterns = "/*")
-        FilterRegistrationBean<RepeatableFilter> registration = new FilterRegistrationBean<>();
+    public RepeatableFilter repeatableFilter() {
-        registration.setFilter(new RepeatableFilter());
+        return new RepeatableFilter();
-        registration.addUrlPatterns("/*");
-        registration.setName("repeatableFilter");
-        registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE);
-        return registration;
     }
 
 }

ruoyi-modules/ruoyi-generator/pom.xml

@@ -53,12 +53,6 @@
             <artifactId>velocity-engine-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.anyline</groupId>
-            <artifactId>anyline-environment-spring-data-jdbc</artifactId>
-            <version>${anyline.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.anyline</groupId>
             <artifactId>anyline-data-jdbc-mysql</artifactId>