与Ruoyi-SpringBoot3做兼容

pom.xml

@@ -10,12 +10,6 @@
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0</version>
-        <relativePath/>
-    </parent>
 
     <properties>
         <ruoyi.version>3.8.5.3</ruoyi.version>
@@ -36,18 +30,21 @@
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
         <knife4j.version>4.3.0</knife4j.version>
+        <mybatis-spring-boot.version>3.0.2</mybatis-spring-boot.version>
     </properties>
 
 
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
-            <!-- servlet包 -->
+            <!-- spring-boot版本2.5.15更换为3.1.5 -->
-            <!--            <dependency>-->
+            <dependency>
-            <!--                <groupId>javax.servlet</groupId>-->
+                <groupId>org.springframework.boot</groupId>
-            <!--                <artifactId>javax.servlet-api</artifactId>-->
+                <artifactId>spring-boot-dependencies</artifactId>
-            <!--                <version>4.0.1</version>-->
+                <version>3.1.5</version>
-            <!--            </dependency>-->
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
             <dependency>
                 <groupId>javax.xml.bind</groupId>
@@ -55,20 +52,11 @@
                 <version>2.3.1</version>
             </dependency>
 
-            <!-- SpringBoot的依赖配置-->
-            <!--            <dependency>-->
-            <!--                <groupId>org.springframework.boot</groupId>-->
-            <!--                <artifactId>spring-boot-dependencies</artifactId>-->
-            <!--                <version>2.7.14</version>-->
-            <!--                <type>pom</type>-->
-            <!--                <scope>import</scope>-->
-            <!--            </dependency>-->
-
             <!-- Mysql驱动包 -->
             <dependency>
                 <groupId>com.mysql</groupId>
                 <artifactId>mysql-connector-j</artifactId>
-                <version>8.0.33</version>
+                <version>8.1.0</version>
                 <scope>runtime</scope>
             </dependency>
 
@@ -197,6 +185,12 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>6.0.0</version>
+            </dependency>
+            
             <!-- knife4j -->
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>

ruoyi-admin/pom.xml

@@ -15,6 +15,12 @@
     </description>
 
     <dependencies>
+        <!-- 注入冲突 -->
+        <!-- <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> -->
+
 
         <!-- spring-boot-devtools -->
         <dependency>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java

@@ -30,8 +30,7 @@ import com.ruoyi.framework.datasource.DynamicDataSource;
  * @author ruoyi
  */
 @Configuration
-public class DruidConfig
+public class DruidConfig {
-{
     @Bean
     public DruidStatProperties druidStatProperties() {
         return new DruidStatProperties();
@@ -39,8 +38,7 @@ public class DruidConfig
 
     @Bean
     @ConfigurationProperties("spring.datasource.druid.master")
-    public DataSource masterDataSource(DruidProperties druidProperties)
+    public DataSource masterDataSource(DruidProperties druidProperties) {
-    {
         DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
         return druidProperties.dataSource(dataSource);
     }
@@ -48,16 +46,14 @@ public class DruidConfig
     @Bean
     @ConfigurationProperties("spring.datasource.druid.slave")
     @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
-    public DataSource slaveDataSource(DruidProperties druidProperties)
+    public DataSource slaveDataSource(DruidProperties druidProperties) {
-    {
         DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
         return druidProperties.dataSource(dataSource);
     }
 
     @Bean(name = "dynamicDataSource")
     @Primary
-    public DynamicDataSource dataSource(DataSource masterDataSource)
+    public DynamicDataSource dataSource(DataSource masterDataSource) {
-    {
         Map<Object, Object> targetDataSources = new HashMap<>();
         targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
         setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
@@ -71,15 +67,11 @@ public class DruidConfig
      * @param sourceName        数据源名称
      * @param beanName          bean名称
      */
-    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName)
+    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName) {
-    {
+        try {
-        try
-        {
             DataSource dataSource = SpringUtils.getBean(beanName);
             targetDataSources.put(sourceName, dataSource);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
         }
     }
 
@@ -89,8 +81,7 @@ public class DruidConfig
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Bean
     @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
-    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties)
+    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) {
-    {
         // 获取web监控页面的参数
         DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
         // 提取common.js的配置路径
@@ -98,16 +89,14 @@ public class DruidConfig
         String commonJsPattern = pattern.replaceAll("\\*", "js/common.js");
         final String filePath = "support/http/resources/js/common.js";
         // 创建filter进行过滤
-        Filter filter = new Filter()
+        Filter filter = new Filter() {
-        {
             @Override
-            public void init(jakarta.servlet.FilterConfig filterConfig) throws ServletException
+            public void init(jakarta.servlet.FilterConfig filterConfig) throws ServletException {
-            {
             }
+
             @Override
             public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-                    throws IOException, ServletException
+                    throws IOException, ServletException {
-            {
                 chain.doFilter(request, response);
                 // 重置缓冲区，响应头不会被重置
                 response.resetBuffer();
@@ -118,9 +107,9 @@ public class DruidConfig
                 text = text.replaceAll("powered.*?shrek.wang</a>", "");
                 response.getWriter().write(text);
             }
+
             @Override
-            public void destroy()
+            public void destroy() {
-            {
             }
         };
         FilterRegistrationBean registrationBean = new FilterRegistrationBean();

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -1,6 +1,7 @@
 package com.ruoyi.framework.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;

ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java

@@ -45,12 +45,14 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont
 
             // 获取方法上边的注解 替代path variable 为 *
             Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class);
-            Optional.ofNullable(method).ifPresent(anonymous -> Objects.requireNonNull(info.getPatternsCondition().getPatterns())
+            Optional.ofNullable(method)
+                    .ifPresent(anonymous -> Objects.requireNonNull(info.getPathPatternsCondition().getPatternValues()) //
                             .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK))));
 
             // 获取类上边的注解, 替代path variable 为 *
             Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class);
-            Optional.ofNullable(controller).ifPresent(anonymous -> Objects.requireNonNull(info.getPatternsCondition().getPatterns())
+            Optional.ofNullable(controller)
+                    .ifPresent(anonymous -> Objects.requireNonNull(info.getPathPatternsCondition().getPatternValues())
                             .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK))));
         });
     }