From 1f42bd3d22c104aaa2d780c20a555b5e467858bf Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 07 十一月 2022 22:10:52 +0800
Subject: [PATCH] !245 数据源由 Druid 修改为 Hikari * update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ;
---
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
index e36ca3c..9d27874 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java
@@ -1,39 +1,41 @@
package com.ruoyi.framework.manager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.ruoyi.common.utils.Threads;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
+
import javax.annotation.PreDestroy;
+import java.util.concurrent.ScheduledExecutorService;
/**
* 纭繚搴旂敤閫�鍑烘椂鑳藉叧闂悗鍙扮嚎绋�
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Slf4j
@Component
-public class ShutdownManager
-{
- private static final Logger logger = LoggerFactory.getLogger("sys-user");
+public class ShutdownManager {
+
+ @Autowired
+ @Qualifier("scheduledExecutorService")
+ private ScheduledExecutorService scheduledExecutorService;
@PreDestroy
- public void destroy()
- {
+ public void destroy() {
shutdownAsyncManager();
}
/**
* 鍋滄寮傛鎵ц浠诲姟
*/
- private void shutdownAsyncManager()
- {
- try
- {
- logger.info("====鍏抽棴鍚庡彴浠诲姟浠诲姟绾跨▼姹�====");
- AsyncManager.me().shutdown();
- }
- catch (Exception e)
- {
- logger.error(e.getMessage(), e);
+ private void shutdownAsyncManager() {
+ try {
+ log.info("====鍏抽棴鍚庡彴浠诲姟浠诲姟绾跨▼姹�====");
+ Threads.shutdownAndAwaitTermination(scheduledExecutorService);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
}
}
}
--
Gitblit v1.9.3