Merge branch 'master' into optimize-memory-cache

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>

src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java

@@ -46,9 +46,9 @@ 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,
             new LinkedBlockingQueue<>(1536),