update 统一格式化代码结构

This commit is contained in:
疯狂的狮子li
2021-10-22 10:04:15 +08:00
parent 32bfe334c0
commit 336adbd056
54 changed files with 806 additions and 987 deletions

View File

@@ -1,33 +1,25 @@
package com.ruoyi.common.utils;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.*;
/**
* 线程相关工具类.
*
*
* @author ruoyi
*/
public class Threads
{
public class Threads {
private static final Logger logger = LoggerFactory.getLogger(Threads.class);
/**
* sleep等待,单位为毫秒
*/
public static void sleep(long milliseconds)
{
try
{
public static void sleep(long milliseconds) {
try {
Thread.sleep(milliseconds);
}
catch (InterruptedException e)
{
} catch (InterruptedException e) {
return;
}
}
@@ -39,24 +31,17 @@ public class Threads
* 如果仍人超時,則強制退出.
* 另对在shutdown时线程本身被调用中断做了处理.
*/
public static void shutdownAndAwaitTermination(ExecutorService pool)
{
if (pool != null && !pool.isShutdown())
{
public static void shutdownAndAwaitTermination(ExecutorService pool) {
if (pool != null && !pool.isShutdown()) {
pool.shutdown();
try
{
if (!pool.awaitTermination(120, TimeUnit.SECONDS))
{
try {
if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
pool.shutdownNow();
if (!pool.awaitTermination(120, TimeUnit.SECONDS))
{
if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
logger.info("Pool did not terminate");
}
}
}
catch (InterruptedException ie)
{
} catch (InterruptedException ie) {
pool.shutdownNow();
Thread.currentThread().interrupt();
}
@@ -66,33 +51,22 @@ public class Threads
/**
* 打印线程异常信息
*/
public static void printException(Runnable r, Throwable t)
{
if (t == null && r instanceof Future<?>)
{
try
{
public static void printException(Runnable r, Throwable t) {
if (t == null && r instanceof Future<?>) {
try {
Future<?> future = (Future<?>) r;
if (future.isDone())
{
if (future.isDone()) {
future.get();
}
}
catch (CancellationException ce)
{
} catch (CancellationException ce) {
t = ce;
}
catch (ExecutionException ee)
{
} catch (ExecutionException ee) {
t = ee.getCause();
}
catch (InterruptedException ie)
{
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
}
}
if (t != null)
{
if (t != null) {
logger.error(t.getMessage(), t);
}
}