From 521142a7920b31999c787722252c4a351693f987 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <773861846@qq.com>
Date: Mon, 25 Jan 2021 16:56:41 +0800
Subject: [PATCH] =?UTF-8?q?v3.5.1=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java2nb/novel/core/config/ThreadPoolConfig.java    |  2 +-
 .../novel/core/config/ThreadPoolProperties.java        |  1 +
 novel-front/src/main/resources/application-dev.yml     | 10 ++++++----
 novel-front/src/main/resources/application-prod.yml    |  6 ++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolConfig.java b/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolConfig.java
index 8548372..6fdfb6a 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolConfig.java
@@ -17,7 +17,7 @@ public class ThreadPoolConfig {
     @Bean
     public ThreadPoolExecutor threadPoolExecutor(ThreadPoolProperties properties){
         return new ThreadPoolExecutor(properties.getCorePoolSize(),properties.getMaximumPoolSize(),properties.getKeepAliveTime()
-                , TimeUnit.MINUTES, new LinkedBlockingDeque<>(),new ThreadPoolExecutor.AbortPolicy());
+                , TimeUnit.SECONDS, new LinkedBlockingDeque<>(properties.getQueueSize()),new ThreadPoolExecutor.AbortPolicy());
     }
 
 }
diff --git a/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolProperties.java b/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolProperties.java
index 00ae748..bf236f3 100644
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolProperties.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/ThreadPoolProperties.java
@@ -16,6 +16,7 @@ public class ThreadPoolProperties {
     private Integer corePoolSize;
     private Integer maximumPoolSize;
     private Long keepAliveTime;
+    private Integer queueSize;
 
 
 }
diff --git a/novel-front/src/main/resources/application-dev.yml b/novel-front/src/main/resources/application-dev.yml
index 41a35b1..83ae91e 100644
--- a/novel-front/src/main/resources/application-dev.yml
+++ b/novel-front/src/main/resources/application-dev.yml
@@ -15,8 +15,10 @@ pic:
 thread:
   pool:
     #核心线程池数量
-    core-pool-size: 100
+    core-pool-size: 10
     #最大线程池数量
-    maximum-pool-size: 10000
-    #线程超时时间（分钟）
-    keep-alive-time: 10
\ No newline at end of file
+    maximum-pool-size: 20
+    #线程超时时间（秒）
+    keep-alive-time: 10
+    #队列大小
+    queue-size: 100
\ No newline at end of file
diff --git a/novel-front/src/main/resources/application-prod.yml b/novel-front/src/main/resources/application-prod.yml
index 9257c11..2e83d60 100644
--- a/novel-front/src/main/resources/application-prod.yml
+++ b/novel-front/src/main/resources/application-prod.yml
@@ -28,8 +28,10 @@ thread:
     #核心线程池数量
     core-pool-size: 10
     #最大线程池数量
-    maximum-pool-size: 200
-    #线程超时时间（分钟）
+    maximum-pool-size: 20
+    #线程超时时间（秒）
     keep-alive-time: 10
+    #队列大小
+    queue-size: 1000