From 619a80228f7a26ce6e478770fb5884733b28f13c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 22 十二月 2021 10:22:00 +0800
Subject: [PATCH] update springboot 2.5.7 => 2.5.8 升级预防 log4j2 问题 update springboot-admin 2.5.4 => 2.5.5 update hutool 5.7.16 => 5.7.17
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 5be9582..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绛夊緟,鍗曚綅涓烘绉�
@@ -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