diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 48464f1a..145469d3 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -271,7 +271,7 @@ thread-pool: # 线程池维护线程所允许的空闲时间 keepAliveSeconds: 300 # 线程池对拒绝任务(无线程可用)的处理策略 - # CALLER_RUNS_POLICY 等待 + # CALLER_RUNS_POLICY 调用方执行 # DISCARD_OLDEST_POLICY 放弃最旧的 # DISCARD_POLICY 丢弃 # ABORT_POLICY 中止 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java index 0c40f341..5529bb33 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java @@ -15,7 +15,7 @@ import java.util.concurrent.ThreadPoolExecutor; @AllArgsConstructor public enum ThreadPoolRejectedPolicy { - CALLER_RUNS_POLICY("等待", ThreadPoolExecutor.CallerRunsPolicy.class), + CALLER_RUNS_POLICY("调用方执行", ThreadPoolExecutor.CallerRunsPolicy.class), DISCARD_OLDEST_POLICY("放弃最旧的", ThreadPoolExecutor.DiscardOldestPolicy.class), DISCARD_POLICY("丢弃", ThreadPoolExecutor.DiscardPolicy.class), ABORT_POLICY("中止", ThreadPoolExecutor.AbortPolicy.class);