From 30d7651322cf24470e432f2827e06ae5578d3212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 4 Jan 2024 16:33:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20springboot=203.1.7=20=3D>=203.2.1=20?=
 =?UTF-8?q?=E5=85=A8=E9=9D=A2=E6=94=AF=E6=8C=81=E8=99=9A=E6=8B=9F=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=20update=20springboot-admin=203.1.8=20=3D>=203.2.0=20?=
 =?UTF-8?q?update=20springdoc=202.2.0=20=3D>=202.3.0=20update=20redisson?=
 =?UTF-8?q?=203.24.3=20=3D>=203.25.2=20update=20hutool=205.8.22=20=3D>=205?=
 =?UTF-8?q?.8.24=20update=20dynamic-ds=204.2.0=20=3D>=204.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            | 14 +++++++-------
 ruoyi-admin/src/main/resources/application.yml     |  5 +++++
 ruoyi-common/ruoyi-common-mybatis/pom.xml          |  2 +-
 ruoyi-common/ruoyi-common-web/pom.xml              | 12 ++++++++++++
 .../dromara/common/web/config/UndertowConfig.java  |  4 ++++
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce9235f8c..1a5add9bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,12 @@
 
     <properties>
         <revision>5.2.0-SNAPSHOT</revision>
-        <spring-boot.version>3.1.7</spring-boot.version>
+        <spring-boot.version>3.2.1</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
         <spring-boot.mybatis>3.0.3</spring-boot.mybatis>
-        <springdoc.version>2.2.0</springdoc.version>
+        <springdoc.version>2.3.0</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <poi.version>5.2.3</poi.version>
         <easyexcel.version>3.3.3</easyexcel.version>
@@ -27,12 +27,12 @@
         <satoken.version>1.37.0</satoken.version>
         <mybatis-plus.version>3.5.5</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
-        <hutool.version>5.8.22</hutool.version>
+        <hutool.version>5.8.24</hutool.version>
         <okhttp.version>4.10.0</okhttp.version>
-        <spring-boot-admin.version>3.1.8</spring-boot-admin.version>
-        <redisson.version>3.24.3</redisson.version>
+        <spring-boot-admin.version>3.2.0</spring-boot-admin.version>
+        <redisson.version>3.25.2</redisson.version>
         <lock4j.version>2.2.5</lock4j.version>
-        <dynamic-ds.version>4.2.0</dynamic-ds.version>
+        <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <alibaba-ttl.version>2.14.4</alibaba-ttl.version>
         <powerjob.version>4.3.6</powerjob.version>
         <mapstruct-plus.version>1.3.5</mapstruct-plus.version>
@@ -212,7 +212,7 @@
 
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 3f54f649b..265e1ef1b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -61,6 +61,11 @@ user:
 spring:
   application:
     name: ${ruoyi.name}
+  threads:
+    # 开启虚拟线程 仅jdk21可用
+    # 开启后还需更改 UndertowConfig 虚拟线程配置
+    virtual:
+      enabled: false
   # 资源信息
   messages:
     # 国际化资源文件路径
diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
index 2088b5439..16d8d5cf1 100644
--- a/ruoyi-common/ruoyi-common-mybatis/pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -39,7 +39,7 @@
 
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.mybatis</groupId>
diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml
index b250fa9d0..fa9b8e8e8 100644
--- a/ruoyi-common/ruoyi-common-web/pom.xml
+++ b/ruoyi-common/ruoyi-common-web/pom.xml
@@ -7,6 +7,18 @@
         <artifactId>ruoyi-common</artifactId>
         <version>${revision}</version>
     </parent>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ruoyi-common-web</artifactId>
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
index 421ce6d14..282f1bf40 100644
--- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
@@ -24,6 +24,10 @@ public class UndertowConfig implements WebServerFactoryCustomizer<UndertowServle
             WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo();
             webSocketDeploymentInfo.setBuffers(new DefaultByteBufferPool(false, 512));
             deploymentInfo.addServletContextAttribute("io.undertow.websockets.jsr.WebSocketDeploymentInfo", webSocketDeploymentInfo);
+            // 使用虚拟线程 解除下方注释 仅限jdk21
+//            if (SpringUtils.getProperty("spring.threads.virtual.enabled", Boolean.class, false)) {
+//                deploymentInfo.setExecutor(Executors.newVirtualThreadPerTaskExecutor());
+//            }
         });
     }