From 3943963505805afd132601d773b719684fd61669 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Mon, 15 Jun 2020 17:40:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Fix]=20BotEventHandler=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=BA=BF=E7=A8=8B=E6=B1=A0=E6=9C=80=E5=A4=A7=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E6=95=B0=E4=B8=8E=E6=9C=80=E4=BD=8E=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E6=95=B0=E9=94=99=E8=AF=AF,=20=E5=AF=BC=E8=87=B4=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=90=AF=E5=8A=A8=E5=BA=94=E7=94=A8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java b/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java
index 867ba27..6f8dac1 100644
--- a/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java
@@ -46,11 +46,11 @@ public class BotEventHandler implements EventHandler {
      * 消息事件执行器
      */
     private final static EventExecutor executor = new EventExecutor(new TimeLimitThreadPoolExecutor(
-            180000, // 3min
+            180000, // 3minThr
             Math.max(Runtime.getRuntime().availableProcessors(), 4),
-            Math.min(Runtime.getRuntime().availableProcessors() * 2, 32),
+            Math.min(Math.max(Runtime.getRuntime().availableProcessors(), 4), 32),
             30L,
-    TimeUnit.SECONDS,
+            TimeUnit.SECONDS,
             new LinkedBlockingQueue<>(1536),
             new ThreadFactoryBuilder()
                     .setNameFormat("CommandProcess-%d")

From bd6b8257041b76b068a68c068a0cab807aba0dae Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Mon, 15 Jun 2020 17:42:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Fix]=20pom.xml=20=E6=8E=92=E9=99=A4slf4j-l?=
 =?UTF-8?q?og4j12=E4=BE=9D=E8=B5=96=E9=A1=B9=E4=BB=A5=E4=BF=AE=E5=A4=8Dpac?=
 =?UTF-8?q?kage=E5=90=8E=E5=BA=94=E7=94=A8=E5=90=AF=E5=8A=A8=E6=8A=A5Slf4j?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index e51a153..e304dd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,6 +166,12 @@
             <groupId>net.lamgc</groupId>
             <artifactId>PixivLoginProxyServer</artifactId>
             <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.squareup</groupId>