Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-27 dd37247e65374dd4ef7e8e8b9212d8f29023e301

 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);
        }
    }
}