From 2712a38d6396d84991fb2fb1e0bbccf0dd74df79 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: Fri, 5 Jan 2024 10:44:27 +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=20springcloud=202022.0.4=20=3D>=202023.0.0?=
 =?UTF-8?q?=20update=20springboot-admin=203.1.8=20=3D>=203.2.0=20update=20?=
 =?UTF-8?q?springdoc=202.2.0=20=3D>=202.3.0=20update=20redisson=203.24.3?=
 =?UTF-8?q?=20=3D>=203.25.2=20update=20hutool=205.8.22=20=3D>=205.8.24=20u?=
 =?UTF-8?q?pdate=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

---
 config/nacos/application-common.yml           |  5 +++++
 pom.xml                                       | 20 +++++++++----------
 ruoyi-common/ruoyi-common-mybatis/pom.xml     |  2 +-
 .../common/web/config/UndertowConfig.java     |  4 ++++
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/config/nacos/application-common.yml b/config/nacos/application-common.yml
index 346b18d2..3940ca62 100644
--- a/config/nacos/application-common.yml
+++ b/config/nacos/application-common.yml
@@ -41,6 +41,11 @@ dubbo:
     log-level: info
 
 spring:
+  threads:
+    # 开启虚拟线程 仅jdk21可用
+    # 开启后还需更改 UndertowConfig 虚拟线程配置
+    virtual:
+      enabled: false
   # 资源信息
   messages:
     # 国际化资源文件路径
diff --git a/pom.xml b/pom.xml
index db45c43b..5665b92f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,22 +17,22 @@
         <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.1.7</spring-boot.version>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
-        <spring-boot-admin.version>3.1.8</spring-boot-admin.version>
+        <spring-boot.version>3.2.1</spring-boot.version>
+        <spring-cloud.version>2023.0.0</spring-cloud.version>
+        <spring-boot-admin.version>3.2.0</spring-boot-admin.version>
         <spring-boot.mybatis>3.0.3</spring-boot.mybatis>
-        <mybatis.version>3.5.13</mybatis.version>
+        <mybatis.version>3.5.15</mybatis.version>
         <mybatis-plus.version>3.5.5</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
-        <dynamic-ds.version>4.2.0</dynamic-ds.version>
+        <dynamic-ds.version>4.3.0</dynamic-ds.version>
         <velocity.version>2.3</velocity.version>
-        <swagger.core.version>2.2.15</swagger.core.version>
-        <springdoc.version>2.2.0</springdoc.version>
+        <swagger.core.version>2.2.19</swagger.core.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>
-        <hutool.version>5.8.22</hutool.version>
-        <redisson.version>3.24.3</redisson.version>
+        <hutool.version>5.8.24</hutool.version>
+        <redisson.version>3.25.2</redisson.version>
         <lock4j.version>2.2.5</lock4j.version>
         <powerjob.version>4.3.6</powerjob.version>
         <satoken.version>1.37.0</satoken.version>
@@ -184,7 +184,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-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
index 64876fb2..b8a93209 100644
--- a/ruoyi-common/ruoyi-common-mybatis/pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -34,7 +34,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/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 421ce6d1..282f1bf4 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());
+//            }
         });
     }