From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
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