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-common/src/main/java/com/ruoyi/common/utils/Threads.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
index 9474a95..1952929 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
@@ -1,7 +1,8 @@
package com.ruoyi.common.utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import java.util.concurrent.*;
@@ -10,8 +11,9 @@
*
* @author ruoyi
*/
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class Threads {
- private static final Logger logger = LoggerFactory.getLogger(Threads.class);
/**
* sleep绛夊緟,鍗曚綅涓烘绉�
@@ -28,7 +30,7 @@
* 鍋滄绾跨▼姹�
* 鍏堜娇鐢╯hutdown, 鍋滄鎺ユ敹鏂颁换鍔″苟灏濊瘯瀹屾垚鎵�鏈夊凡瀛樺湪浠诲姟.
* 濡傛灉瓒呮椂, 鍒欒皟鐢╯hutdownNow, 鍙栨秷鍦╳orkQueue涓璓ending鐨勪换鍔�,骞朵腑鏂墍鏈夐樆濉炲嚱鏁�.
- * 濡傛灉浠嶄汉瓒呮檪锛屽墖寮峰埗閫�鍑�.
+ * 濡傛灉浠嶇劧瓒呮檪锛屽墖寮峰埗閫�鍑�.
* 鍙﹀鍦╯hutdown鏃剁嚎绋嬫湰韬璋冪敤涓柇鍋氫簡澶勭悊.
*/
public static void shutdownAndAwaitTermination(ExecutorService pool) {
@@ -38,7 +40,7 @@
if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
pool.shutdownNow();
if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
- logger.info("Pool did not terminate");
+ log.info("Pool did not terminate");
}
}
} catch (InterruptedException ie) {
@@ -67,7 +69,7 @@
}
}
if (t != null) {
- logger.error(t.getMessage(), t);
+ log.error(t.getMessage(), t);
}
}
}
--
Gitblit v1.9.3