From 41a3bdf73dc7fdbbbe69a9b943ff6f8552a463e1 Mon Sep 17 00:00:00 2001
From: 秋辞未寒 <545073804@qq.com>
Date: 星期四, 02 一月 2025 15:34:40 +0800
Subject: [PATCH] !629 update 优化jdk21环境开启虚拟线程时的定时任务池 * update 优化jdk21环境开启虚拟线程时的定时任务池
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java
index cb3d8f7..7040330 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java
@@ -1,8 +1,11 @@
package org.dromara.common.core.config;
-import org.dromara.common.core.config.properties.ThreadPoolProperties;
-import org.dromara.common.core.utils.Threads;
+import jakarta.annotation.PreDestroy;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.dromara.common.core.config.properties.ThreadPoolProperties;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.Threads;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -11,6 +14,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
/**
@@ -18,6 +22,7 @@
*
* @author Lion Li
**/
+@Slf4j
@AutoConfiguration
@EnableConfigurationProperties(ThreadPoolProperties.class)
public class ThreadPoolConfig {
@@ -26,6 +31,8 @@
* 鏍稿績绾跨▼鏁� = cpu 鏍稿績鏁� + 1
*/
private final int core = Runtime.getRuntime().availableProcessors() + 1;
+
+ private ScheduledExecutorService scheduledExecutorService;
@Bean(name = "threadPoolTaskExecutor")
@ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true")
@@ -44,8 +51,23 @@
*/
@Bean(name = "scheduledExecutorService")
protected ScheduledExecutorService scheduledExecutorService() {
- return new ScheduledThreadPoolExecutor(core,
- new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
+ ThreadFactory threadFactory;
+ // 鏄惁鍚敤铏氭嫙绾跨▼
+ if (SpringUtils.isVirtual()) {
+ // 铏氭嫙绾跨▼蹇呴』涓哄畧鎶ょ嚎绋嬶紝鍗� daemon 鍙兘鏄� true
+ threadFactory = new BasicThreadFactory.Builder()
+ .daemon(true)
+ .namingPattern("virtual-schedule-pool-%d")
+ .wrappedFactory(Thread.ofVirtual().factory())
+ .build();
+ } else {
+ threadFactory = new BasicThreadFactory.Builder()
+ .daemon(true)
+ .namingPattern("schedule-pool-%d")
+ .build();
+ }
+ ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(core,
+ threadFactory,
new ThreadPoolExecutor.CallerRunsPolicy()) {
@Override
protected void afterExecute(Runnable r, Throwable t) {
@@ -53,5 +75,21 @@
Threads.printException(r, t);
}
};
+ this.scheduledExecutorService = scheduledThreadPoolExecutor;
+ return scheduledThreadPoolExecutor;
}
+
+ /**
+ * 閿�姣佷簨浠�
+ */
+ @PreDestroy
+ public void destroy() {
+ try {
+ log.info("====鍏抽棴鍚庡彴浠诲姟浠诲姟绾跨▼姹�====");
+ Threads.shutdownAndAwaitTermination(scheduledExecutorService);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+
}
--
Gitblit v1.9.3