[Version] 更新版本(2.5.2-20200618.1-SNAPSHOT -> 2.5.2-20200630.1-SNAPSHOT);

[Fix] AutoCleanTimer 修复自动清除定时器没有重复工作;
[Fix] LocalHashCacheStore 修复clean方法抛出'ConcurrentModificationException'异常的问题; [Change] CacheStoreCentral 调整PreLoadData的热点缓存时间; [Change] HotDataCacheStore 将最近获取的Key重置其过期时间, 调整clean过程;
2025-07-02 05:17:26 +00:00 · 2020-06-30 01:23:04 +08:00 · 2020-06-30 01:21:17 +08:00 · 2020-06-29 23:33:41 +08:00 · 2020-06-23 13:53:54 +08:00 · 2020-06-23 10:02:47 +08:00
46 changed files with 803 additions and 757 deletions
--- a/Dockerfile.sample
+++ b/Dockerfile.sample
@ -1,10 +1,10 @@
-FROM openjdk:8u252-jre
+FROM openjdk:14

+COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
 ENV jarFileName=ContentGrabbingJi-exec.jar
 ENV CGJ_REDIS_URI="127.0.0.1:6379"
 ENV CGJ_PROXY=""
 RUN mkdir /data/
+CMD [java, "-Dcgj.logsPath=/data/logs", "-jar", "/CGJ.jar", "botMode", "-botDataDir=/data"]

 COPY ${jarFileName} /CGJ.jar
-
-CMD ["java", "-Dcgj.logsPath=/data/logs", "-jar", "/CGJ.jar", "botMode", "-botDataDir=/data"]
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@

    <groupId>net.lamgc</groupId>
    <artifactId>ContentGrabbingJi</artifactId>
-    <version>2.5.2-20200610.4-SNAPSHOT</version>
+    <version>2.5.2-20200630.1-SNAPSHOT</version>

    <licenses>
        <license>
@ -162,11 +162,6 @@
            <artifactId>ktor-server-core</artifactId>
            <version>${ktor.version}</version>
        </dependency>
-        <dependency>
-            <groupId>net.lamgc</groupId>
-            <artifactId>PixivLoginProxyServer</artifactId>
-            <version>1.1.1</version>
-        </dependency>
        <dependency>
            <groupId>com.squareup</groupId>
            <artifactId>gifencoder</artifactId>
@ -177,6 +172,12 @@
            <artifactId>jline</artifactId>
            <version>3.15.0</version>
        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>4.2.3</version>
+        </dependency>
+
    </dependencies>

 </project>
--- a/src/main/java/net/lamgc/cgj/Main.java
+++ b/src/main/java/net/lamgc/cgj/Main.java
@ -1,7 +1,5 @@
 package net.lamgc.cgj;

-import com.github.monkeywie.proxyee.proxy.ProxyConfig;
-import com.github.monkeywie.proxyee.proxy.ProxyType;
 import com.google.common.base.Strings;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@ -13,12 +11,12 @@ import net.lamgc.cgj.bot.framework.cli.ConsoleMain;
 import net.lamgc.cgj.bot.framework.coolq.CQConfig;
 import net.lamgc.cgj.bot.framework.mirai.MiraiMain;
 import net.lamgc.cgj.pixiv.PixivDownload;
-import net.lamgc.cgj.pixiv.PixivSearchBuilder;
+import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder;
 import net.lamgc.cgj.pixiv.PixivURL;
-import net.lamgc.plps.PixivLoginProxyServer;
 import net.lamgc.utils.base.runner.Argument;
 import net.lamgc.utils.base.runner.ArgumentsRunner;
 import net.lamgc.utils.base.runner.Command;
+import net.lamgc.utils.encrypt.MessageDigestUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.CookieStore;
@ -52,6 +50,14 @@ public class Main {
    private static HttpHost proxy;

    public static void main(String[] args) throws IOException, ClassNotFoundException {
+        if(args.length != 0 && args[0].equalsIgnoreCase("buildpassword")) {
+            ArgumentsRunner.run(Main.class, args);
+        } else {
+            standardStart(args);
+        }
+    }
+
+    private static void standardStart(String[] args) throws IOException, ClassNotFoundException {
        log.info("ContentGrabbingJi 正在启动...");
        log.debug("Args: {}, LogsPath: {}", Arrays.toString(args), System.getProperty("cgj.logsPath"));
        log.debug("运行目录: {}", System.getProperty("user.dir"));
@ -62,16 +68,9 @@ public class Main {
        proxy = BotGlobal.getGlobal().getProxy();
        File cookieStoreFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "cookies.store");
        if(!cookieStoreFile.exists()) {
-            log.warn("未找到cookies.store文件, 是否启动PixivLoginProxyServer? (yes/no)");
-            try(Scanner scanner = new Scanner(System.in)) {
-                if(scanner.nextLine().trim().equalsIgnoreCase("yes")) {
-                    startPixivLoginProxyServer();
-                } else {
-                    System.exit(1);
-                    return;
-                }
-            }
-            
+            log.warn("未找到cookies.store文件, 请检查数据存放目录下是否存在'cookies.store'文件！");
+            System.exit(1);
+            return;
        }
        ObjectInputStream ois = new ObjectInputStream(new FileInputStream(cookieStoreFile));
        cookieStore = (CookieStore) ois.readObject();
@ -85,6 +84,13 @@ public class Main {
        System.exit(0);
    }

+    @Command
+    public static void buildPassword(@Argument(name = "password") String password) {
+        System.out.println("Password: " +
+                Base64.getEncoder().encodeToString(MessageDigestUtils.encrypt(password.getBytes(),
+                MessageDigestUtils.Algorithm.MD5)));
+    }
+
    @Command
    public static void botMode(@Argument(name = "args", force = false) String argsStr) {
        MiraiMain main = new MiraiMain();
@ -254,24 +260,24 @@ public class Main {
            @Argument(name = "excludeKeywords", force = false) String excludeKeywords,
            @Argument(name = "contentOption", force = false) String contentOption
    ) throws IOException {
-        PixivSearchBuilder searchBuilder = new PixivSearchBuilder(Strings.isNullOrEmpty(content) ? "" : content);
+        PixivSearchLinkBuilder searchBuilder = new PixivSearchLinkBuilder(Strings.isNullOrEmpty(content) ? "" : content);
        if (type != null) {
            try {
-                searchBuilder.setSearchType(PixivSearchBuilder.SearchType.valueOf(type.toUpperCase()));
+                searchBuilder.setSearchType(PixivSearchLinkBuilder.SearchType.valueOf(type.toUpperCase()));
            } catch (IllegalArgumentException e) {
                log.warn("不支持的SearchType: {}", type);
            }
        }
        if(area != null) {
            try {
-                searchBuilder.setSearchArea(PixivSearchBuilder.SearchArea.valueOf(area));
+                searchBuilder.setSearchArea(PixivSearchLinkBuilder.SearchArea.valueOf(area));
            } catch (IllegalArgumentException e) {
                log.warn("不支持的SearchArea: {}", area);
            }
        }
        if(contentOption != null) {
            try {
-                searchBuilder.setSearchContentOption(PixivSearchBuilder.SearchContentOption.valueOf(contentOption));
+                searchBuilder.setSearchContentOption(PixivSearchLinkBuilder.SearchContentOption.valueOf(contentOption));
            } catch (IllegalArgumentException e) {
                log.warn("不支持的SearchContentOption: {}", contentOption);
            }
@ -310,7 +316,7 @@ public class Main {

        JsonObject resultBody = jsonObject.getAsJsonObject("body");

-        for(PixivSearchBuilder.SearchArea searchArea : PixivSearchBuilder.SearchArea.values()) {
+        for(PixivSearchLinkBuilder.SearchArea searchArea : PixivSearchLinkBuilder.SearchArea.values()) {
            if(!resultBody.has(searchArea.jsonKey) || resultBody.getAsJsonObject(searchArea.jsonKey).getAsJsonArray("data").size() == 0) {
                //log.info("返回数据不包含 {}", searchArea.jsonKey);
                continue;
@ -349,57 +355,6 @@ public class Main {
        log.info("这里啥都没有哟w");
    }

-    private static void saveCookieStoreToFile() throws IOException {
-        log.info("正在保存CookieStore...");
-        File outputFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "cookies.store");
-        if(!outputFile.exists() && !outputFile.createNewFile()){
-            log.error("保存CookieStore失败.");
-            return;
-        }
-        ObjectOutputStream stream = new ObjectOutputStream(new FileOutputStream(outputFile));
-        stream.writeObject(cookieStore);
-        stream.flush();
-        stream.close();
-        log.info("CookieStore保存成功.");
-    }
-
-    private static void startPixivLoginProxyServer(){
-        ProxyConfig proxyConfig = null;
-        if(proxy != null) {
-            proxyConfig = new ProxyConfig(ProxyType.HTTP, proxy.getHostName(), proxy.getPort());
-        }
-        PixivLoginProxyServer proxyServer = new PixivLoginProxyServer(proxyConfig);
-        Thread proxyServerStartThread = new Thread(() -> {
-            log.info("启动代理服务器...");
-            proxyServer.start(1006);
-            log.info("代理服务器已关闭.");
-        });
-        proxyServerStartThread.setName("LoginProxyServerThread");
-        proxyServerStartThread.start();
-        //System.console().readLine();
-        
-        log.info("登录完成后, 使用\"done\"命令结束登录过程.");
-        try(Scanner scanner = new Scanner(System.in)) {
-            while(true) {
-                if (scanner.nextLine().equalsIgnoreCase("done")) {
-                    log.info("关闭PLPS服务器...");
-                    proxyServer.close();
-                    cookieStore = proxyServer.getCookieStore();
-                    try {
-                        log.info("正在保存CookieStore...");
-                        saveCookieStoreToFile();
-                        log.info("CookieStore保存完成.");
-                    } catch (IOException e) {
-                        log.error("CookieStore保存时发生异常, 本次CookieStore仅可在本次运行使用.", e);
-                    }
-                    break;
-                } else {
-                    log.warn("要结束登录过程, 请使用\"done\"命令.");
-                }
-            }
-        }
-    }
-
    private static File getStoreDir() {
        if(!storeDir.exists() && !storeDir.mkdirs()) {
            log.error("创建文件夹失败!");
--- a/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java
+++ b/src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java
@ -270,7 +270,7 @@ public class BotAdminCommandProcess {
        }

        AutoSender sender = new RandomRankingArtworksSender(
-                MessageSenderBuilder.getMessageSender(MessageSource.Group, id),
+                MessageSenderBuilder.getMessageSender(MessageSource.GROUP, id),
                id,
                rankingStart,
                rankingEnd,
--- a/src/main/java/net/lamgc/cgj/bot/BotCode.java
+++ b/src/main/java/net/lamgc/cgj/bot/BotCode.java
@ -64,7 +64,7 @@ public class BotCode {

    private String platformName;
    private String functionName;
-    private Hashtable<String, String> parameter = new Hashtable<>();
+    private final Hashtable<String, String> parameter = new Hashtable<>();

    /**
     * 构造一个机器功能码
--- a/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java
+++ b/src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java
@ -8,11 +8,12 @@ import net.lamgc.cgj.bot.boot.BotGlobal;
 import net.lamgc.cgj.bot.cache.CacheStore;
 import net.lamgc.cgj.bot.cache.CacheStoreCentral;
 import net.lamgc.cgj.bot.cache.JsonRedisCacheStore;
-import net.lamgc.cgj.bot.event.BufferMessageEvent;
-import net.lamgc.cgj.bot.sort.PreLoadDataComparator;
+import net.lamgc.cgj.bot.event.BufferedMessageSender;
+import net.lamgc.cgj.bot.sort.PreLoadDataAttribute;
+import net.lamgc.cgj.bot.sort.PreLoadDataAttributeComparator;
 import net.lamgc.cgj.pixiv.PixivDownload;
 import net.lamgc.cgj.pixiv.PixivDownload.PageQuality;
-import net.lamgc.cgj.pixiv.PixivSearchBuilder;
+import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder;
 import net.lamgc.cgj.pixiv.PixivURL;
 import net.lamgc.utils.base.runner.Argument;
 import net.lamgc.utils.base.runner.Command;
@ -23,6 +24,7 @@ import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;

@SuppressWarnings({"SameParameterValue"})
 public class BotCommandProcess {
@ -90,7 +92,8 @@ public class BotCommandProcess {
     */
    @Command(commandName = "info")
    public static String artworkInfo(@Argument(name = "$fromGroup") long fromGroup,
-                                     @Argument(name = "id") int illustId) {
+                                     @Argument(name = "id") int illustId)
+    throws InterruptedException {
        if(illustId <= 0) {
            return "这个作品Id是错误的！";
        }
@ -100,21 +103,21 @@ public class BotCommandProcess {
                return "阅览禁止：该作品已被封印！！";
            }

-            JsonObject illustPreLoadData = CacheStoreCentral.getIllustPreLoadData(illustId, false);
+            JsonObject illustPreLoadData = CacheStoreCentral.getCentral().getIllustPreLoadData(illustId, false);
            // 在 Java 6 开始, 编译器会将用'+'进行的字符串拼接将自动转换成StringBuilder拼接
            return "色图姬帮你了解了这个作品的信息！\n" + "---------------- 作品信息 ----------------" +
                    "\n作品Id: " + illustId +
                    "\n作品标题：" + illustPreLoadData.get("illustTitle").getAsString() +
                    "\n作者(作者Id)：" + illustPreLoadData.get("userName").getAsString() +
                    "(" + illustPreLoadData.get("userId").getAsInt() + ")" +
-                    "\n点赞数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt() +
-                    "\n收藏数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt() +
-                    "\n围观数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt() +
-                    "\n评论数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt() +
-                    "\n页数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.PAGE.attrName).getAsInt() + "页" +
+                    "\n点赞数：" + illustPreLoadData.get(PreLoadDataAttribute.LIKE.attrName).getAsInt() +
+                    "\n收藏数：" + illustPreLoadData.get(PreLoadDataAttribute.BOOKMARK.attrName).getAsInt() +
+                    "\n围观数：" + illustPreLoadData.get(PreLoadDataAttribute.VIEW.attrName).getAsInt() +
+                    "\n评论数：" + illustPreLoadData.get(PreLoadDataAttribute.COMMENT.attrName).getAsInt() +
+                    "\n页数：" + illustPreLoadData.get(PreLoadDataAttribute.PAGE.attrName).getAsInt() + "页" +
                    "\n作品链接：" + artworksLink(fromGroup, illustId) + "\n" +
                    "---------------- 作品图片 ----------------\n" +
-                    CacheStoreCentral.getImageById(fromGroup, illustId, PageQuality.REGULAR, 1) + "\n" +
+                    CacheStoreCentral.getCentral().getImageById(fromGroup, illustId, PageQuality.REGULAR, 1) + "\n" +
                    "使用 \".cgj image -id " +
                    illustId +
                    "\" 获取原图。\n如有不当作品，可使用\".cgj report -id " +
@ -140,8 +143,8 @@ public class BotCommandProcess {
            @Argument(force = false, name = "date") Date queryTime,
            @Argument(force = false, name = "force") boolean force,
            @Argument(force = false, name = "mode", defaultValue = "DAILY") String contentMode,
-            @Argument(force = false, name = "type", defaultValue = "ILLUST") String contentType
-    ) {
+            @Argument(force = false, name = "type", defaultValue = "ALL") String contentType
+    ) throws InterruptedException {
        Date queryDate = queryTime;
        if (queryDate == null) {
            queryDate = new Date();
@ -209,7 +212,7 @@ public class BotCommandProcess {
                log.warn("配置项 {} 的参数值格式有误!", imageLimitPropertyKey);
            }

-            List<JsonObject> rankingInfoList = CacheStoreCentral
+            List<JsonObject> rankingInfoList = CacheStoreCentral.getCentral()
                    .getRankingInfoByCache(type, mode, queryDate, 1, Math.max(0, itemLimit), false);
            if(rankingInfoList.isEmpty()) {
                return "无法查询排行榜，可能排行榜尚未更新。";
@ -228,7 +231,7 @@ public class BotCommandProcess {
                        .append(pagesCount).append("p.\n");
                if (index <= imageLimit) {
                    resultBuilder
-                            .append(CacheStoreCentral
+                            .append(CacheStoreCentral.getCentral()
                                    .getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1))
                            .append("\n");
                }
@ -279,12 +282,12 @@ public class BotCommandProcess {
            return "参数无效, 请查看帮助信息";
        }

-        BufferMessageEvent event = new BufferMessageEvent();
+        BufferedMessageSender bufferedSender = new BufferedMessageSender();
        RandomRankingArtworksSender artworksSender = 
-            new RandomRankingArtworksSender(event, fromGroup, 1, 200, mode, type,
+            new RandomRankingArtworksSender(bufferedSender, fromGroup, 1, 200, mode, type,
                    PageQuality.ORIGINAL);
        artworksSender.send();
-        return event.getBufferMessage();
+        return bufferedSender.getBufferContent();
    }

    /**
@ -309,11 +312,11 @@ public class BotCommandProcess {
            @Argument(name = "in", force = false) String includeKeywords,
            @Argument(name = "ex", force = false) String excludeKeywords,
            @Argument(name = "option", force = false) String contentOption,
-            @Argument(name = "page", force = false, defaultValue = "1") int pagesIndex
-    ) throws IOException {
-        log.info("正在执行搜索...");
-        JsonObject resultBody = CacheStoreCentral
-                .getSearchBody(content, type, area, includeKeywords, excludeKeywords, contentOption);
+            @Argument(name = "p", force = false, defaultValue = "1") int pagesIndex
+    ) throws IOException, InterruptedException {
+        log.debug("正在执行搜索...");
+        JsonObject resultBody = CacheStoreCentral.getCentral()
+                .getSearchBody(content, type, area, includeKeywords, excludeKeywords, contentOption, pagesIndex);

        StringBuilder result = new StringBuilder("内容 " + content + " 的搜索结果：\n");
        log.debug("正在处理信息...");
@ -325,7 +328,7 @@ public class BotCommandProcess {
            log.warn("参数转换异常!将使用默认值(" + limit + ")", e);
        }
        int totalCount = 0;
-        for (PixivSearchBuilder.SearchArea searchArea : PixivSearchBuilder.SearchArea.values()) {
+        for (PixivSearchLinkBuilder.SearchArea searchArea : PixivSearchLinkBuilder.SearchArea.values()) {
            if (!resultBody.has(searchArea.jsonKey) ||
                    resultBody.getAsJsonObject(searchArea.jsonKey).getAsJsonArray("data").size() == 0) {
                log.debug("返回数据不包含 {}", searchArea.jsonKey);
@ -335,9 +338,9 @@ public class BotCommandProcess {
                    .getAsJsonObject(searchArea.jsonKey).getAsJsonArray("data");
            ArrayList<JsonElement> illustsList = new ArrayList<>();
            illustsArray.forEach(illustsList::add);
-            illustsList.sort(new PreLoadDataComparator(PreLoadDataComparator.Attribute.LIKE));
+            illustsList.sort(new PreLoadDataAttributeComparator(PreLoadDataAttribute.BOOKMARK));

-            log.info("已找到与 {} 相关插图信息({})：", content, searchArea.name().toLowerCase());
+            log.debug("已找到与 {} 相关插图信息({})：", content, searchArea.name().toLowerCase());
            int count = 1;
            for (JsonElement jsonElement : illustsList) {
                if (count > limit) {
@ -365,8 +368,17 @@ public class BotCommandProcess {
                        PixivURL.getPixivRefererLink(illustId)
                );

-                String imageMsg =
-                        CacheStoreCentral.getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1);
+                String imageMsg;
+                try {
+                    imageMsg = CacheStoreCentral.getCentral()
+                            .getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1);
+                } catch (NoSuchElementException e) {
+                    if(e.getMessage().startsWith("No work found: ")) {
+                        log.warn("作品 {} 不存在, 跳过该作品...", illustId);
+                        continue;
+                    }
+                    throw e;
+                }
                if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
                    log.warn("作品Id {} 为R-18作品, 跳过.", illustId);
                    continue;
@ -375,20 +387,21 @@ public class BotCommandProcess {
                    continue;
                }

-                JsonObject illustPreLoadData = CacheStoreCentral.getIllustPreLoadData(illustId, false);
+                JsonObject illustPreLoadData = CacheStoreCentral.getCentral()
+                        .getIllustPreLoadData(illustId, false);
                result.append(searchArea.name()).append(" (").append(count).append(" / ")
                        .append(limit).append(")\n\t作品id: ").append(illustId)
                        .append(", \n\t作者名: ").append(illustObj.get("userName").getAsString())
                        .append("\n\t作品标题: ").append(illustObj.get("illustTitle").getAsString())
                        .append("\n\t作品页数: ").append(illustObj.get("pageCount").getAsInt()).append("页")
                        .append("\n\t点赞数：")
-                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt())
+                        .append(illustPreLoadData.get(PreLoadDataAttribute.LIKE.attrName).getAsInt())
                        .append("\n\t收藏数：")
-                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt())
+                        .append(illustPreLoadData.get(PreLoadDataAttribute.BOOKMARK.attrName).getAsInt())
                        .append("\n\t围观数：")
-                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt())
+                        .append(illustPreLoadData.get(PreLoadDataAttribute.VIEW.attrName).getAsInt())
                        .append("\n\t评论数：")
-                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt())
+                        .append(illustPreLoadData.get(PreLoadDataAttribute.COMMENT.attrName).getAsInt())
                        .append("\n").append(imageMsg).append("\n");
                count++;
                totalCount++;
@ -463,7 +476,7 @@ public class BotCommandProcess {

    static void clearCache() {
        log.warn("正在清除所有缓存...");
-        CacheStoreCentral.clearCache();
+        CacheStoreCentral.getCentral().clearCache();
        File imageStoreDir = new File(BotGlobal.getGlobal().getDataStoreDir(), "data/image/cgj/");
        File[] listFiles = imageStoreDir.listFiles();
        if (listFiles == null) {
@ -482,9 +495,9 @@ public class BotCommandProcess {
            @Argument(name = "$fromGroup") long fromGroup,
            @Argument(name = "id") int illustId,
            @Argument(name = "quality", force = false) PixivDownload.PageQuality quality,
-            @Argument(name = "page", force = false, defaultValue = "1") int pageIndex
-    ) {
-        return CacheStoreCentral.getImageById(fromGroup, illustId, quality, pageIndex);
+            @Argument(name = "p", force = false, defaultValue = "1") int pageIndex
+    ) throws InterruptedException {
+        return CacheStoreCentral.getCentral().getImageById(fromGroup, illustId, quality, pageIndex);
    }

    /**
@ -521,6 +534,10 @@ public class BotCommandProcess {
        return reportStore.exists(String.valueOf(illustId));
    }

+    /**
+     * Tag过滤表达式
+     */
+    private final static Pattern tagPattern = Pattern.compile(".*R-*18.*");
    /**
     * 检查指定作品是否为r18
     * @param illustId 作品Id
@ -532,12 +549,12 @@ public class BotCommandProcess {
     */
    public static boolean isNoSafe(int illustId, Properties settingProp, boolean returnRaw)
            throws IOException, NoSuchElementException {
-        JsonObject illustInfo = CacheStoreCentral.getIllustInfo(illustId, false);
+        JsonObject illustInfo = CacheStoreCentral.getCentral().getIllustInfo(illustId, false);
        JsonArray tags = illustInfo.getAsJsonArray("tags");
        boolean rawValue = illustInfo.get("xRestrict").getAsInt() != 0;
        if(!rawValue) {
            for(JsonElement tag : tags) {
-                boolean current = tag.getAsString().matches("R-*18") || tag.getAsString().contains("R18");
+                boolean current = tagPattern.matcher(tag.getAsString()).matches();
                if (current) {
                    rawValue = true;
                    break;
--- a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java
+++ b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java
@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 */
 public class RandomIntervalSendTimer extends TimerTask {

-    private final static Timer timer = new Timer("Thread-RIST", true);
+    private final static Timer timer = new Timer("Thread-RandomIntervalSendTimer", true);
    private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class);
    private final static Map<Long, RandomIntervalSendTimer> timerMap = new HashMap<>();

@ -77,7 +77,13 @@ public class RandomIntervalSendTimer extends TimerTask {
     * @param startNow 现在开始
     * @param loop 是否循环
     */
-    private RandomIntervalSendTimer(long timerId, AutoSender sender, long time, int floatTime, boolean startNow, boolean loop) {
+    private RandomIntervalSendTimer(
+            long timerId,
+            AutoSender sender,
+            long time,
+            int floatTime,
+            boolean startNow,
+            boolean loop) {
        this.timerId = timerId;
        this.sender = sender;
        this.time = time;
@ -119,11 +125,15 @@ public class RandomIntervalSendTimer extends TimerTask {

    @Override
    public void run() {
+        log.info("定时器 {} 开始执行...(Sender: {}@{})", this.hashId, sender.getClass().getSimpleName(), sender.hashCode());
        try {
            sender.send();
        } catch (Exception e) {
-            log.error("定时器 {} 执行时发生异常:\n{}", Integer.toHexString(this.hashCode()), Throwables.getStackTraceAsString(e));
+            log.error("定时器 {} 执行时发生异常:\n{}",
+                    Integer.toHexString(this.hashCode()),
+                    Throwables.getStackTraceAsString(e));
        }
+        log.info("定时器 {} 执行结束.", this.hashId);
        if (this.loop.get()) {
            start();
        }
--- a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java
@ -92,7 +92,7 @@ public class RandomRankingArtworksSender extends AutoSender {

        int selectRanking = rankingStart + new Random().nextInt(rankingStop - rankingStart + 1);
        try {
-            List<JsonObject> rankingList = CacheStoreCentral.getRankingInfoByCache(
+            List<JsonObject> rankingList = CacheStoreCentral.getCentral().getRankingInfoByCache(
                    contentType,
                    mode,
                    queryDate,
@ -119,7 +119,7 @@ public class RandomRankingArtworksSender extends AutoSender {
            String message = "#美图推送 - 今日排行榜 第 " + rankingInfo.get("rank").getAsInt() + " 名\n" +
                    "标题：" + rankingInfo.get("title").getAsString() + "(" + illustId + ")\n" +
                    "作者：" + rankingInfo.get("user_name").getAsString() + "\n" +
-                    CacheStoreCentral.getImageById(0, illustId, quality, 1) +
+                    CacheStoreCentral.getCentral().getImageById(0, illustId, quality, 1) +
                    "\n如有不当作品，可使用\".cgj report -id " + illustId + "\"向色图姬反馈。";
            getMessageSender().sendMessage(message);
        } catch (Exception e) {
--- a/src/main/java/net/lamgc/cgj/bot/boot/BotGlobal.java
+++ b/src/main/java/net/lamgc/cgj/bot/boot/BotGlobal.java
@ -27,7 +27,7 @@ public final class BotGlobal {

    public static BotGlobal getGlobal() {
        if(instance == null) {
-            throw new IllegalStateException("");
+            throw new IllegalStateException("BotGlobal has not been initialized");
        }
        return instance;
    }
--- a/src/main/java/net/lamgc/cgj/bot/cache/AutoCleanTimer.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/AutoCleanTimer.java
@ -18,7 +18,7 @@ public class AutoCleanTimer extends TimerTask {
    private final static Logger log = LoggerFactory.getLogger(AutoCleanTimer.class);

    static {
-        cleanTimer.schedule(new AutoCleanTimer(), 100L);
+        cleanTimer.schedule(new AutoCleanTimer(), 100L, 100L);
    }

    /**
--- a/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java
@ -8,9 +8,12 @@ import net.lamgc.cgj.bot.BotCode;
 import net.lamgc.cgj.bot.BotCommandProcess;
 import net.lamgc.cgj.bot.SettingProperties;
 import net.lamgc.cgj.bot.boot.BotGlobal;
+import net.lamgc.cgj.exception.HttpRequestException;
 import net.lamgc.cgj.pixiv.PixivDownload;
-import net.lamgc.cgj.pixiv.PixivSearchBuilder;
+import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder;
 import net.lamgc.cgj.pixiv.PixivURL;
+import net.lamgc.cgj.util.Locker;
+import net.lamgc.cgj.util.LockerMap;
 import net.lamgc.cgj.util.URLs;
 import net.lamgc.utils.encrypt.MessageDigestUtils;
 import net.lz1998.cq.utils.CQCode;
@ -31,55 +34,82 @@ import java.util.concurrent.atomic.AtomicInteger;
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
 public final class CacheStoreCentral {

-    private CacheStoreCentral() {}
-
    private final static Logger log = LoggerFactory.getLogger(CacheStoreCentral.class);

-    private final static Hashtable<String, File> imageCache = new Hashtable<>();
+    private static CacheStoreCentral central = new CacheStoreCentral();

-    private final static JsonRedisCacheStore imageChecksumCache =
+    public static CacheStoreCentral getCentral() {
+        if(central == null) {
+            initialCentral();
+        }
+        return central;
+    }
+
+    private synchronized static void initialCentral() {
+        if(central != null) {
+            return;
+        }
+
+        central = new CacheStoreCentral();
+    }
+
+    private final LockerMap<String> lockerMap = new LockerMap<>();
+
+    private CacheStoreCentral() {}
+
+    private final Hashtable<String, File> imageCache = new Hashtable<>();
+
+    private final CacheStore<JsonElement> imageChecksumCache =
            new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(),
                    "imageChecksum", BotGlobal.getGlobal().getGson());

+    /*
+     * 注意：
+     *      在启用了远端缓存的情况下, 不允许滥用本地缓存
+     *      只有在处理命令中需要短时间大量存取的缓存项才能进行本地缓存(例如PreLoadData需要在排序中大量获取);
+     *      如果没有短时间大量存取的需要, 切勿使用本地缓存
+     */
+
    /**
     * 作品信息缓存 - 不过期
     */
-    private final static CacheStore<JsonElement> illustInfoCache =
+    private final CacheStore<JsonElement> illustInfoCache =
            new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(),
                    "illustInfo", BotGlobal.getGlobal().getGson());

    /**
-     * 作品信息预加载数据 - 有效期 2 小时, 本地缓存有效期1 ± 0.25
+     * 作品信息预加载数据 - 有效期 2 小时, 本地缓存有效期 0.5 ± 0.25 小时
     */
-    private final static CacheStore<JsonElement> illustPreLoadDataCache =
+    private final CacheStore<JsonElement> illustPreLoadDataCache =
            CacheStoreUtils.hashLocalHotDataStore(
                    new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(),
                            "illustPreLoadData", BotGlobal.getGlobal().getGson()),
-                    3600000, 900000);
+                    // 600000, 120000);
+                    60000, 1);
    /**
     * 搜索内容缓存, 有效期 2 小时
     */
-    private final static CacheStore<JsonElement> searchBodyCache =
+    private final CacheStore<JsonElement> searchBodyCache =
            new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(),
                    "searchBody", BotGlobal.getGlobal().getGson());

    /**
     * 排行榜缓存, 不过期
     */
-    private final static CacheStore<List<JsonObject>> rankingCache =
+    private final CacheStore<List<JsonObject>> rankingCache =
            new JsonObjectRedisListCacheStore(BotGlobal.getGlobal().getRedisServer(),
                    "ranking", BotGlobal.getGlobal().getGson());

    /**
     * 作品页面下载链接缓存 - 不过期
     */
-    private final static CacheStore<List<String>> pagesCache =
+    private final CacheStore<List<String>> pagesCache =
            new StringListRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "imagePages");

    /**
     * 清空所有缓存
     */
-    public static void clearCache() {
+    public void clearCache() {
        imageCache.clear();
        illustInfoCache.clear();
        illustPreLoadDataCache.clear();
@ -96,7 +126,7 @@ public final class CacheStoreCentral {
     * @param pageIndex 指定页面索引, 从1开始
     * @return 如果成功, 返回BotCode, 否则返回错误信息.
     */
-    public static String getImageById(long fromGroup, int illustId, PixivDownload.PageQuality quality, int pageIndex) {
+    public String getImageById(long fromGroup, int illustId, PixivDownload.PageQuality quality, int pageIndex) throws InterruptedException {
        log.debug("IllustId: {}, Quality: {}, PageIndex: {}", illustId, quality.name(), pageIndex);
        if(pageIndex <= 0) {
            log.warn("指定的页数不能小于或等于0: {}", pageIndex);
@ -118,7 +148,7 @@ public final class CacheStoreCentral {

        List<String> pagesList;
        try {
-            pagesList = CacheStoreCentral.getIllustPages(illustId, quality, false);
+            pagesList = getIllustPages(illustId, quality, false);
        } catch (IOException e) {
            log.error("获取下载链接列表时发生异常", e);
            return "发生网络异常，无法获取图片！";
@ -147,10 +177,10 @@ public final class CacheStoreCentral {
                ImageChecksum imageChecksum = getImageChecksum(illustId, pageIndex);
                if(imageChecksum != null) {
                    try {
-                        log.debug("正在检查作品Id {} 第 {} 页图片文件 {} ...", illustId, pageIndex, imageFile.getName());
+                        log.trace("正在检查作品Id {} 第 {} 页图片文件 {} ...", illustId, pageIndex, imageFile.getName());
                        if (ImageChecksum.checkFile(imageChecksum, Files.readAllBytes(imageFile.toPath()))) {
                            imageCache.put(URLs.getResourceName(downloadLink), imageFile);
-                            log.debug("作品Id {} 第 {} 页缓存已补充.", illustId, pageIndex);
+                            log.trace("作品Id {} 第 {} 页缓存已补充.", illustId, pageIndex);
                            return getImageToBotCode(imageFile, false).toString();
                        } else {
                            log.warn("图片文件 {} 校验失败, 重新下载图片...", imageFile.getName());
@ -171,13 +201,13 @@ public final class CacheStoreCentral {
                }
            } catch (InterruptedException e) {
                log.warn("图片缓存被中断", e);
-                return "(错误：图片获取超时)";
+                throw e;
            } catch (Throwable e) {
                log.error("图片 {} 获取失败:\n{}", illustId + "p" + pageIndex, Throwables.getStackTraceAsString(e));
                return "(错误: 图片获取出错)";
            }
        } else {
-            log.debug("图片 {} 缓存命中.", fileName);
+            log.trace("图片 {} 缓存命中.", fileName);
        }

        return getImageToBotCode(imageCache.get(fileName), false).toString();
@ -190,7 +220,7 @@ public final class CacheStoreCentral {
     * @return 返回设定好参数的BotCode
     */
    @SuppressWarnings("SameParameterValue")
-    private static BotCode getImageToBotCode(File targetFile, boolean updateCache) {
+    private BotCode getImageToBotCode(File targetFile, boolean updateCache) {
        String fileName = Objects.requireNonNull(targetFile, "targetFile is null").getName();
        BotCode code = BotCode.parse(
                CQCode.image(BotGlobal.getGlobal().getImageStoreDir().getName() + "/" + fileName));
@ -208,22 +238,28 @@ public final class CacheStoreCentral {
     * @throws IOException 当Http请求发生异常时抛出
     * @throws NoSuchElementException 当作品未找到时抛出
     */
-    public static JsonObject getIllustInfo(int illustId, boolean flushCache)
+    public JsonObject getIllustInfo(int illustId, boolean flushCache)
            throws IOException, NoSuchElementException {
-        String illustIdStr = buildSyncKey(Integer.toString(illustId));
+        Locker<String> locker = buildSyncKey(Integer.toString(illustId));
+        String illustIdStr = locker.getKey();
        JsonObject illustInfoObj = null;
        if (!illustInfoCache.exists(illustIdStr) || flushCache) {
-            synchronized (illustIdStr) {
-                if (!illustInfoCache.exists(illustIdStr) || flushCache) {
-                    illustInfoObj = BotGlobal.getGlobal().getPixivDownload().getIllustInfoByIllustId(illustId);
-                    illustInfoCache.update(illustIdStr, illustInfoObj, null);
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!illustInfoCache.exists(illustIdStr) || flushCache) {
+                        illustInfoObj = BotGlobal.getGlobal().getPixivDownload().getIllustInfoByIllustId(illustId);
+                        illustInfoCache.update(illustIdStr, illustInfoObj, null);
+                    }
                }
+            } finally {
+                locker.unlock();
            }
        }

        if(Objects.isNull(illustInfoObj)) {
            illustInfoObj = illustInfoCache.getCache(illustIdStr).getAsJsonObject();
-            log.debug("作品Id {} IllustInfo缓存命中.", illustId);
+            log.trace("作品Id {} IllustInfo缓存命中.", illustId);
        }
        return illustInfoObj;
    }
@ -236,66 +272,79 @@ public final class CacheStoreCentral {
     * @return 成功返回JsonObject对象
     * @throws IOException 当Http请求处理发生异常时抛出
     */
-    public static JsonObject getIllustPreLoadData(int illustId, boolean flushCache) throws IOException {
-        String illustIdStr = buildSyncKey(Integer.toString(illustId));
+    public JsonObject getIllustPreLoadData(int illustId, boolean flushCache) throws IOException {
+        Locker<String> locker = buildSyncKey(Integer.toString(illustId));
+        String illustIdStr = locker.getKey();
        JsonObject result = null;
        if (!illustPreLoadDataCache.exists(illustIdStr) || flushCache) {
-            synchronized (illustIdStr) {
-                if (!illustPreLoadDataCache.exists(illustIdStr) || flushCache) {
-                    log.debug("IllustId {} 缓存失效, 正在更新...", illustId);
-                    JsonObject preLoadDataObj = BotGlobal.getGlobal().getPixivDownload()
-                            .getIllustPreLoadDataById(illustId)
-                            .getAsJsonObject("illust")
-                            .getAsJsonObject(Integer.toString(illustId));
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!illustPreLoadDataCache.exists(illustIdStr) || flushCache) {
+                        log.trace("IllustId {} 缓存失效, 正在更新...", illustId);
+                        JsonObject preLoadDataObj = BotGlobal.getGlobal().getPixivDownload()
+                                .getIllustPreLoadDataById(illustId)
+                                .getAsJsonObject("illust")
+                                .getAsJsonObject(Integer.toString(illustId));

-                    long expire = 7200 * 1000;
-                    String propValue = SettingProperties.
-                            getProperty(SettingProperties.GLOBAL, "cache.illustPreLoadData.expire", "7200000");
-                    log.debug("PreLoadData有效时间设定: {}", propValue);
-                    try {
-                        expire = Long.parseLong(propValue);
-                    } catch (Exception e) {
-                        log.warn("全局配置项 \"{}\" 值非法, 已使用默认值: {}", propValue, expire);
+                        long expire = 7200 * 1000;
+                        String propValue = SettingProperties.
+                                getProperty(SettingProperties.GLOBAL, "cache.illustPreLoadData.expire", "7200000");
+                        log.debug("PreLoadData有效时间设定: {}", propValue);
+                        try {
+                            expire = Long.parseLong(propValue);
+                        } catch (Exception e) {
+                            log.warn("全局配置项 \"{}\" 值非法, 已使用默认值: {}", propValue, expire);
+                        }
+
+                        result = preLoadDataObj;
+                        illustPreLoadDataCache.update(illustIdStr, preLoadDataObj, expire);
+                        log.trace("作品Id {} preLoadData缓存已更新(有效时间: {})", illustId, expire);
                    }
-
-                    result = preLoadDataObj;
-                    illustPreLoadDataCache.update(illustIdStr, preLoadDataObj, expire);
-                    log.debug("作品Id {} preLoadData缓存已更新(有效时间: {})", illustId, expire);
                }
+            } finally {
+                locker.unlock();
            }
        }

        if(Objects.isNull(result)) {
            result = illustPreLoadDataCache.getCache(illustIdStr).getAsJsonObject();
-            log.debug("作品Id {} PreLoadData缓存命中.", illustId);
+            log.trace("作品Id {} PreLoadData缓存命中.", illustId);
        }
        return result;
    }

-    public static List<String> getIllustPages(int illustId, PixivDownload.PageQuality quality, boolean flushCache)
+    public List<String> getIllustPages(int illustId, PixivDownload.PageQuality quality, boolean flushCache)
            throws IOException {
-        String pagesSign = buildSyncKey(Integer.toString(illustId), ".", quality.name());
+        Locker<String> locker
+                = buildSyncKey(Integer.toString(illustId), ".", quality.name());
+        String pagesSign = locker.getKey();
        List<String> result = null;
        if (!pagesCache.exists(pagesSign) || flushCache) {
-            synchronized (pagesSign) {
-                if (!pagesCache.exists(pagesSign) || flushCache) {
-                    List<String> linkList = PixivDownload
-                            .getIllustAllPageDownload(BotGlobal.getGlobal().getPixivDownload().getHttpClient(),
-                                    BotGlobal.getGlobal().getPixivDownload().getCookieStore(), illustId, quality);
-                    result = linkList;
-                    pagesCache.update(pagesSign, linkList, null);
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!pagesCache.exists(pagesSign) || flushCache) {
+                        List<String> linkList = PixivDownload
+                                .getIllustAllPageDownload(BotGlobal.getGlobal().getPixivDownload().getHttpClient(),
+                                        BotGlobal.getGlobal().getPixivDownload().getCookieStore(), illustId, quality);
+                        result = linkList;
+                        pagesCache.update(pagesSign, linkList, null);
+                    }
                }
+            } finally {
+                locker.unlock();
            }
        }

        if(Objects.isNull(result)) {
            result = pagesCache.getCache(pagesSign);
-            log.debug("作品Id {} Pages缓存命中.", illustId);
+            log.trace("作品Id {} Pages缓存命中.", illustId);
        }
        return result;
    }

-    private final static Random expireTimeFloatRandom = new Random();
+    private final Random expireTimeFloatRandom = new Random();
    /**
     * 获取排行榜
     * @param contentType 排行榜类型
@ -307,7 +356,7 @@ public final class CacheStoreCentral {
     * @return 成功返回有值List, 失败且无异常返回空
     * @throws IOException 获取异常时抛出
     */
-    public static List<JsonObject> getRankingInfoByCache(PixivURL.RankingContentType contentType,
+    public List<JsonObject> getRankingInfoByCache(PixivURL.RankingContentType contentType,
                                                         PixivURL.RankingMode mode,
                                                         Date queryDate, int start, int range, boolean flushCache)
            throws IOException {
@ -324,31 +373,37 @@ public final class CacheStoreCentral {
        }

        String date = new SimpleDateFormat("yyyyMMdd").format(queryDate);
-        String requestSign = buildSyncKey(contentType.name(), ".", mode.name(), ".", date);
+        Locker<String> locker
+                = buildSyncKey(contentType.name(), ".", mode.name(), ".", date);
+        String requestSign = locker.getKey();
        List<JsonObject> result = null;
        if(!rankingCache.exists(requestSign) || flushCache) {
-            synchronized(requestSign) {
-                if(!rankingCache.exists(requestSign) || flushCache) {
-                    log.debug("Ranking缓存失效, 正在更新...(RequestSign: {})", requestSign);
-                    List<JsonObject> rankingResult = BotGlobal.getGlobal().getPixivDownload()
-                            .getRanking(contentType, mode, queryDate, 1, 500);
-                    long expireTime = 0;
-                    if(rankingResult.size() == 0) {
-                        expireTime = 5400000 + expireTimeFloatRandom.nextInt(1800000);
-                        log.warn("数据获取失败, 将设置浮动有效时间以准备下次更新. (ExpireTime: {}ms)", expireTime);
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!rankingCache.exists(requestSign) || flushCache) {
+                        log.trace("Ranking缓存失效, 正在更新...(RequestSign: {})", requestSign);
+                        List<JsonObject> rankingResult = BotGlobal.getGlobal().getPixivDownload()
+                                .getRanking(contentType, mode, queryDate, 1, 500);
+                        long expireTime = 0;
+                        if (rankingResult.size() == 0) {
+                            expireTime = 5400000 + expireTimeFloatRandom.nextInt(1800000);
+                            log.warn("数据获取失败, 将设置浮动有效时间以准备下次更新. (ExpireTime: {}ms)", expireTime);
+                        }
+                        result = new ArrayList<>(rankingResult).subList(start - 1, start + range - 1);
+                        rankingCache.update(requestSign, rankingResult, expireTime);
+                        log.trace("Ranking缓存更新完成.(RequestSign: {})", requestSign);
                    }
-                    result = new ArrayList<>(rankingResult).subList(start - 1, start + range - 1);
-                    rankingCache.update(requestSign, rankingResult, expireTime);
-                    log.debug("Ranking缓存更新完成.(RequestSign: {})", requestSign);
                }
+            } finally {
+                locker.unlock();
            }
        }

        if (Objects.isNull(result)) {
            result = rankingCache.getCache(requestSign, start - 1, range);
-            log.debug("RequestSign [{}] 缓存命中.", requestSign);
+            log.trace("RequestSign [{}] 缓存命中.", requestSign);
        }
-        log.debug("Result-Length: {}", result.size());
        return PixivDownload.getRanking(result, start - 1, range);
    }

@ -363,31 +418,34 @@ public final class CacheStoreCentral {
     * @return 返回完整搜索结果
     * @throws IOException 当请求发生异常, 或接口返回异常信息时抛出.
     */
-    public static JsonObject getSearchBody(
+    public JsonObject getSearchBody(
            String content,
            String type,
            String area,
            String includeKeywords,
            String excludeKeywords,
-            String contentOption) throws IOException {
-        PixivSearchBuilder searchBuilder = new PixivSearchBuilder(Strings.isNullOrEmpty(content) ? "" : content);
+            String contentOption,
+            int pageIndex
+    ) throws IOException {
+        PixivSearchLinkBuilder searchBuilder = new PixivSearchLinkBuilder(Strings.isNullOrEmpty(content) ? "" : content);
        if (type != null) {
            try {
-                searchBuilder.setSearchType(PixivSearchBuilder.SearchType.valueOf(type.toUpperCase()));
+                searchBuilder.setSearchType(PixivSearchLinkBuilder.SearchType.valueOf(type.toUpperCase()));
            } catch (IllegalArgumentException e) {
                log.warn("不支持的SearchType: {}", type);
            }
        }
        if (area != null) {
            try {
-                searchBuilder.setSearchArea(PixivSearchBuilder.SearchArea.valueOf(area));
+                searchBuilder.setSearchArea(PixivSearchLinkBuilder.SearchArea.valueOf(area));
            } catch (IllegalArgumentException e) {
                log.warn("不支持的SearchArea: {}", area);
            }
        }
        if (contentOption != null) {
            try {
-                searchBuilder.setSearchContentOption(PixivSearchBuilder.SearchContentOption.valueOf(contentOption));
+                searchBuilder.setSearchContentOption(
+                        PixivSearchLinkBuilder.SearchContentOption.valueOf(contentOption.trim().toUpperCase()));
            } catch (IllegalArgumentException e) {
                log.warn("不支持的SearchContentOption: {}", contentOption);
            }
@ -397,58 +455,69 @@ public final class CacheStoreCentral {
            for (String keyword : includeKeywords.split(";")) {
                searchBuilder.removeExcludeKeyword(keyword.trim());
                searchBuilder.addIncludeKeyword(keyword.trim());
-                log.debug("已添加关键字: {}", keyword);
+                log.trace("已添加关键字: {}", keyword);
            }
        }
        if (!Strings.isNullOrEmpty(excludeKeywords)) {
            for (String keyword : excludeKeywords.split(";")) {
                searchBuilder.removeIncludeKeyword(keyword.trim());
                searchBuilder.addExcludeKeyword(keyword.trim());
-                log.debug("已添加排除关键字: {}", keyword);
+                log.trace("已添加排除关键字: {}", keyword);
            }
        }

-        log.info("正在搜索作品, 条件: {}", searchBuilder.getSearchCondition());
+        if(pageIndex > 0) {
+            searchBuilder.setPage(pageIndex);
+        }

-        String requestUrl = searchBuilder.buildURL().intern();
+        log.debug("正在搜索作品, 条件: {}", searchBuilder.getSearchCondition());
+
+        Locker<String> locker
+                = buildSyncKey(searchBuilder.buildURL());
+        String requestUrl = locker.getKey();
        log.debug("RequestUrl: {}", requestUrl);
        JsonObject resultBody = null;
        if(!searchBodyCache.exists(requestUrl)) {
-            synchronized (requestUrl) {
-                if (!searchBodyCache.exists(requestUrl)) {
-                    log.debug("searchBody缓存失效, 正在更新...");
-                    JsonObject jsonObject;
-                    HttpGet httpGetRequest = BotGlobal.getGlobal().getPixivDownload().
-                            createHttpGetRequest(requestUrl);
-                    HttpResponse response = BotGlobal.getGlobal().getPixivDownload().
-                            getHttpClient().execute(httpGetRequest);
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!searchBodyCache.exists(requestUrl)) {
+                        log.trace("searchBody缓存失效, 正在更新...");
+                        JsonObject jsonObject;
+                        HttpGet httpGetRequest = BotGlobal.getGlobal().getPixivDownload().
+                                createHttpGetRequest(requestUrl);
+                        HttpResponse response = BotGlobal.getGlobal().getPixivDownload().
+                                getHttpClient().execute(httpGetRequest);

-                    String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-                    log.debug("ResponseBody: {}", responseBody);
-                    jsonObject = BotGlobal.getGlobal().getGson().fromJson(responseBody, JsonObject.class);
+                        String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                        log.trace("ResponseBody: {}", responseBody);
+                        jsonObject = BotGlobal.getGlobal().getGson().fromJson(responseBody, JsonObject.class);

-                    if (jsonObject.get("error").getAsBoolean()) {
-                        log.error("接口请求错误, 错误信息: {}", jsonObject.get("message").getAsString());
-                        throw new IOException("Interface Request Error: " + jsonObject.get("message").getAsString());
+                        if (jsonObject.get("error").getAsBoolean()) {
+                            log.error("接口请求错误, 错误信息: {}", jsonObject.get("message").getAsString());
+                            throw new HttpRequestException(response.getStatusLine(), responseBody);
+                        }
+
+                        long expire = 7200 * 1000;
+                        String propValue = SettingProperties
+                                .getProperty(SettingProperties.GLOBAL, "cache.searchBody.expire", "7200000");
+                        try {
+                            expire = Long.parseLong(propValue);
+                        } catch (Exception e) {
+                            log.warn("全局配置项 \"{}\" 值非法, 已使用默认值: {}", propValue, expire);
+                        }
+                        resultBody = jsonObject.getAsJsonObject().getAsJsonObject("body");
+                        searchBodyCache.update(requestUrl, jsonObject, expire);
+                        log.trace("searchBody缓存已更新(有效时间: {})", expire);
+                    } else {
+                        log.trace("搜索缓存命中.");
                    }
-
-                    long expire = 7200 * 1000;
-                    String propValue = SettingProperties
-                            .getProperty(SettingProperties.GLOBAL, "cache.searchBody.expire", "7200000");
-                    try {
-                        expire = Long.parseLong(propValue);
-                    } catch (Exception e) {
-                        log.warn("全局配置项 \"{}\" 值非法, 已使用默认值: {}", propValue, expire);
-                    }
-                    resultBody = jsonObject.getAsJsonObject().getAsJsonObject("body");
-                    searchBodyCache.update(requestUrl, jsonObject, expire);
-                    log.debug("searchBody缓存已更新(有效时间: {})", expire);
-                } else {
-                    log.debug("搜索缓存命中.");
                }
+            } finally {
+                locker.unlock();
            }
        } else {
-            log.debug("搜索缓存命中.");
+            log.trace("搜索缓存命中.");
        }

        if(Objects.isNull(resultBody)) {
@ -457,7 +526,7 @@ public final class CacheStoreCentral {
        return resultBody;
    }

-    protected static ImageChecksum getImageChecksum(int illustId, int pageIndex) {
+    protected ImageChecksum getImageChecksum(int illustId, int pageIndex) {
        String cacheKey = illustId + ":" + pageIndex;
        if(!imageChecksumCache.exists(cacheKey)) {
            return null;
@ -466,7 +535,7 @@ public final class CacheStoreCentral {
        }
    }

-    protected static void setImageChecksum(ImageChecksum checksum) {
+    protected void setImageChecksum(ImageChecksum checksum) {
        String cacheKey = checksum.getIllustId() + ":" + checksum.getPage();
        imageChecksumCache.update(cacheKey, ImageChecksum.toJsonObject(checksum), 0);
    }
@ -476,12 +545,12 @@ public final class CacheStoreCentral {
     * @param keys String对象
     * @return 合并后, 如果常量池存在合并后的结果, 则返回常量池中的对象, 否则存入常量池后返回.
     */
-    private static String buildSyncKey(String... keys) {
+    private Locker<String> buildSyncKey(String... keys) {
        StringBuilder sb = new StringBuilder();
        for (String string : keys) {
            sb.append(string);
        }
-        return sb.toString().intern();
+        return lockerMap.createLocker(sb.toString(), true);
    }

    /**
--- a/src/main/java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java
@ -75,6 +75,9 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
            log.trace("Current缓存库更新完成.");
            result = parentResult;
        } else {
+            // 更新该Key的过期时间
+            current.update(key, result,
+                    expireTime + (expireFloatRange <= 0 ? 0 : random.nextInt(expireFloatRange)));
            log.trace("Current缓存库缓存命中.");
        }
        return result;
@ -138,10 +141,14 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
     * <p>该方法仅清理Current缓存库, 不会对上游缓存库造成影响.</p>
     */
    @Override
-    public void clean() {
-        for(String key : this.current.keys()) {
-            if(current.exists(key)) {
-                current.remove(key);
+    public void clean() throws Exception {
+        if(current instanceof Cleanable) {
+            ((Cleanable) current).clean();
+        } else {
+            for(String key : this.current.keys()) {
+                if (!current.exists(key)) {
+                    current.remove(key);
+                }
            }
        }
    }
--- a/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java
@ -1,7 +1,7 @@
 package net.lamgc.cgj.bot.cache;

 import net.lamgc.cgj.bot.boot.BotGlobal;
-import net.lamgc.cgj.bot.cache.exception.HttpRequestException;
+import net.lamgc.cgj.exception.HttpRequestException;
 import net.lamgc.cgj.pixiv.PixivURL;
 import net.lamgc.cgj.util.URLs;
 import net.lamgc.utils.event.EventHandler;
@ -38,7 +38,7 @@ public class ImageCacheHandler implements EventHandler {
        }

        try {
-            log.info("图片 {} Event正在进行...({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
+            log.debug("图片 {} Event正在进行...({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
            File storeFile = event.getStoreFile();
            log.debug("正在缓存图片 {} (Path: {})", storeFile.getName(), storeFile.getAbsolutePath());
            try {
@ -66,7 +66,7 @@ public class ImageCacheHandler implements EventHandler {
                throw requestException;
            }

-            log.debug("正在下载...(Content-Length: {}KB)", response.getEntity().getContentLength() / 1024);
+            log.trace("正在下载...(Content-Length: {}KB)", response.getEntity().getContentLength() / 1024);
            ByteArrayOutputStream bufferOutputStream = new ByteArrayOutputStream();
            try(FileOutputStream fileOutputStream = new FileOutputStream(storeFile)) {
                Streams.copy(response.getEntity().getContent(), bufferOutputStream, false);
@ -80,14 +80,14 @@ public class ImageCacheHandler implements EventHandler {
                            );
                bufferInputStream.reset();
                Streams.copy(bufferInputStream, fileOutputStream, false);
-                CacheStoreCentral.setImageChecksum(imageChecksum);
+                CacheStoreCentral.getCentral().setImageChecksum(imageChecksum);
            } catch (IOException e) {
                log.error("下载图片时发生异常", e);
                throw e;
            }
            event.getImageCache().put(URLs.getResourceName(event.getDownloadLink()), storeFile);
        } finally {
-            log.info("图片 {} Event结束({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
+            log.debug("图片 {} Event结束({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
            cacheQueue.remove(event);
        }
    }
--- a/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java
@ -7,7 +7,7 @@ import com.google.gson.JsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import net.lamgc.cgj.bot.cache.exception.HttpRequestException;
+import net.lamgc.cgj.exception.HttpRequestException;

 import java.util.Hashtable;
 import java.util.Map;
@ -66,17 +66,17 @@ public final class ImageCacheStore {
            // 置任务状态
            task.taskState.set(TaskState.RUNNING);

-            Throwable throwable = null;
+            Future<Throwable> future = imageCacheExecutor.submit(() -> {
+                try {
+                    handler.getImageToCache(cacheObject);
+                } catch (Throwable e) {
+                    return e;
+                }
+                return null;
+            });
+            Throwable throwable;
            try {
-                throwable = imageCacheExecutor.submit(() -> {
-                    try {
-                        handler.getImageToCache(cacheObject);
-                    } catch (Throwable e) {
-                        return e;
-                    }
-                    return null;
-                }).get();
-
+                throwable = future.get();
                if(throwable == null) {
                    task.taskState.set(TaskState.COMPLETE);
                } else {
@ -84,6 +84,12 @@ public final class ImageCacheStore {
                }
            } catch (ExecutionException e) {
                log.error("执行图片缓存任务时发生异常", e);
+                task.taskState.set(TaskState.ERROR);
+                return e.getCause();
+            } catch (InterruptedException e) {
+                future.cancel(true);
+                task.taskState.set(TaskState.ERROR);
+                throw e;
            }
            return throwable;
        } finally {
--- a/src/main/java/net/lamgc/cgj/bot/cache/LocalHashCacheStore.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/LocalHashCacheStore.java
@ -2,10 +2,7 @@ package net.lamgc.cgj.bot.cache;

 import org.jetbrains.annotations.NotNull;

-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;

 /**
@ -149,19 +146,22 @@ public class LocalHashCacheStore<T> implements CacheStore<T>, Cleanable {
    }

    @Override
-    public void clean() throws Exception {
+    public void clean() {
        Date currentDate = new Date();
+        Set<String> expireKeySet = new HashSet<>();
        cache.forEach((key, value) -> {
            if(value.isExpire(currentDate)) {
-                cache.remove(key);
+                expireKeySet.add(key);
            }
        });
+
+        expireKeySet.forEach(cache::remove);
    }

    public static class CacheObject<T> implements Comparable<CacheObject<T>> {

-        private AtomicReference<T> value;
-        private AtomicReference<Date> expire;
+        private final AtomicReference<T> value;
+        private final AtomicReference<Date> expire;

        public CacheObject(T value, Date expire) {
            this.value = new AtomicReference<>(value);
--- a/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java
@ -51,27 +51,27 @@ abstract class RedisPoolCacheStore<T> implements CacheStore<T> {

    @Override
    public void update(String key, T value, Date expire) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        executeJedisCommand(jedis -> {
            jedis.set(keyPrefix + key, parse(value));
            if(expire != null) {
                jedis.pexpireAt(keyPrefix + key, expire.getTime());
                log.debug("已设置Key {} 的过期时间(Expire: {})", key, expire.getTime());
            }
-        }
+        });
    }

    @Override
    public T getCache(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
            return analysis(jedis.get(keyPrefix + key));
-        }
+        });
    }

    @Override
    public boolean exists(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
            return jedis.exists(keyPrefix + key);
-        }
+        });
    }

    @Override
@ -81,23 +81,21 @@ abstract class RedisPoolCacheStore<T> implements CacheStore<T> {

    @Override
    public boolean clear() {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
            return jedis.flushDB().equalsIgnoreCase("ok");
-        }
+        });
    }

    @Override
    public Set<String> keys() {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
            return jedis.keys(keyPrefix + "*");
-        }
+        });
    }

    @Override
    public boolean remove(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
-            return jedis.del(keyPrefix + key) == 1;
-        }
+        return executeJedisCommand(jedis -> jedis.del(keyPrefix + key) == 1);
    }

    /**
--- 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(
-            0,
+            180000, // 3minThr
            Math.max(Runtime.getRuntime().availableProcessors(), 4),
-            Math.max(Math.max(Runtime.getRuntime().availableProcessors() * 2, 4), 32),
+            Math.min(Math.max(Runtime.getRuntime().availableProcessors(), 4), 32),
            30L,
-    TimeUnit.SECONDS,
+            TimeUnit.SECONDS,
            new LinkedBlockingQueue<>(1536),
            new ThreadFactoryBuilder()
                    .setNameFormat("CommandProcess-%d")
@ -69,11 +69,15 @@ public class BotEventHandler implements EventHandler {
            return;
        }

+        executor.setEnableEventResend(true);
        executor.setEventUncaughtExceptionHandler(new EventUncaughtExceptionHandler() {
            private final Logger log = LoggerFactory.getLogger(this.getClass());
            @Override
            public void exceptionHandler(Thread executeThread, EventHandler handler, Method handlerMethod, EventObject event, Throwable cause) {
-                log.error("发生未捕获异常:\nThread:{}, EventHandler: {}, HandlerMethod: {}, EventObject: {}\n{}",
+                log.error("EventExecutor@{} 发生未捕获异常:\n\t" +
+                                "Thread:{}\n\tEventHandler: {}\n\tHandlerMethod: {}\n\tEventObject: {}\n" +
+                        "------------------ Stack Trace ------------------\n{}",
+                        executor.hashCode(),
                        executeThread.getName(),
                        handler.toString(),
                        handlerMethod.getName(),
@ -105,8 +109,6 @@ public class BotEventHandler implements EventHandler {
        runnerConfig.addStringParameterParser(new DateParser(new SimpleDateFormat("yyyy-MM-dd")));
        runnerConfig.addStringParameterParser(new PagesQualityParser());

-        log.debug("DateParser添加情况: {}", runnerConfig.hasStringParameterParser(Date.class));
-
        processRunner = new ArgumentsRunner(BotCommandProcess.class, runnerConfig);
        adminRunner = new ArgumentsRunner(BotAdminCommandProcess.class, runnerConfig);

@ -130,6 +132,7 @@ public class BotEventHandler implements EventHandler {
    /**
     * 投递消息事件
     * @param event 事件对象
+     * @param sync 是否同步执行事件
     */
    @NotAccepted
    public static void executeMessageEvent(MessageEvent event, boolean sync) throws InterruptedException {
@ -221,8 +224,8 @@ public class BotEventHandler implements EventHandler {
        } catch(DeveloperRunnerException e) {
            Throwable cause = e.getCause();
            if (cause instanceof InterruptedException) {
-                log.error("命令执行超时, 终止执行.");
-                result = "色图姬发现这个命令的处理时间太久了！所以打断了这个命令。";
+                log.error("命令执行超时, 终止执行.", cause);
+                result = "色图姬查阅图库太久，被赶出来了！";
            } else if(cause instanceof NoSuchElementException && cause.getMessage().startsWith("No work found: ")) {
                String message = cause.getMessage();
                log.error("指定作品不存在.(Id: {})", message.substring(message.lastIndexOf(": ") + 2));
@ -236,9 +239,12 @@ public class BotEventHandler implements EventHandler {
        if(!Objects.isNull(result) && result instanceof String && !isMute(event.getFromGroup())) {
            try {
                int sendResult = event.sendMessage((String) result);
-                if(sendResult < 0) {
+                if (sendResult < 0) {
                    log.warn("消息发送失败, Sender {} 返回错误代码: {}", event.getClass().getName(), sendResult);
                }
+            } catch(InterruptedException e) {
+                log.info("事件在发送消息时超时, 重新投递该事件.(Event: {})", event);
+                EventExecutor.resendCurrentEvent();
            } catch (Exception e) {
                log.error("发送消息时发生异常", e);
            }
@ -260,6 +266,11 @@ public class BotEventHandler implements EventHandler {
        return !message.startsWith(COMMAND_PREFIX) && !message.startsWith(ADMIN_COMMAND_PREFIX);
    }

+    /**
+     * 查询某群组中Bot是否被禁言
+     * @param groupId 待查询的群组号
+     * @return 如果被禁言, 返回true, 如果未被禁言或禁言情况未知, 返回false
+     */
    private static boolean isMute(long groupId) {
        Boolean mute = isMute(groupId, false);
        return mute != null && mute;
--- a/src/main/java/net/lamgc/cgj/bot/event/BufferMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/BufferMessageEvent.java
@ -1,70 +0,0 @@
-package net.lamgc.cgj.bot.event;
-
-import java.util.Objects;
-
-public class BufferMessageEvent extends MessageEvent {
-
-    private final StringBuffer buffer = new StringBuffer();
-
-    private final MessageEvent parent;
-
-    /**
-     * 以空消息空Id生成BufferMessageEvent
-     */
-    public BufferMessageEvent() {
-        super(0, 0, "");
-        parent = null;
-    }
-
-    /**
-     * 提供消息内容构造BufferMessageEvent
-     * @param message 传入的消息内容
-     */
-    public BufferMessageEvent(String message) {
-        super(0, 0, message);
-        parent = null;
-    }
-
-    /**
-     * 提供消息内容构和Id信息造BufferMessageEvent
-     * @param groupId 群组Id
-     * @param qqId 发送者Id
-     * @param message 传入的消息内容
-     */
-    public BufferMessageEvent(int groupId, int qqId, String message) {
-        super(groupId, qqId, message);
-        parent = null;
-    }
-
-    /**
-     * 使用事件构造BufferMessageEvent
-     * @param parentEvent 父级消息事件对象
-     */
-    public BufferMessageEvent(MessageEvent parentEvent) {
-        super(parentEvent.getFromGroup(), parentEvent.getFromQQ(), parentEvent.getMessage());
-        parent = parentEvent;
-    }
-
-    @Override
-    public int sendMessage(String message) {
-        buffer.append(message);
-        return 0;
-    }
-
-    /**
-     * 当提供了父级消息事件时, 本方法调用父级消息事件对象的{@code getImageUrl(String)}, 如果没有, 返回{@code null}
-     */
-    @Override
-    public String getImageUrl(String image) {
-        return Objects.isNull(this.parent) ? null : this.parent.getImageUrl(image);
-    }
-
-    /**
-     * 获取缓冲区消息内容
-     * @return 消息内容
-     */
-    public String getBufferMessage() {
-        return buffer.toString();
-    }
-
-}
--- a/src/main/java/net/lamgc/cgj/bot/event/BufferedMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/BufferedMessageSender.java
@ -0,0 +1,23 @@
+package net.lamgc.cgj.bot.event;
+
+import net.lamgc.cgj.bot.message.MessageSender;
+
+public class BufferedMessageSender implements MessageSender {
+
+    private final StringBuffer buffer = new StringBuffer();
+
+    @Override
+    public int sendMessage(String message) {
+        buffer.append(message);
+        return 0;
+    }
+
+    /**
+     * 从缓冲区中取出消息内容.
+     * @return 返回事件发送的消息内容.
+     */
+    public String getBufferContent() {
+        return buffer.toString();
+    }
+
+}
--- a/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java
@ -57,7 +57,7 @@ public abstract class MessageEvent implements EventObject, MessageSender {

    @Override
    public String toString() {
-        return this.getClass().getSimpleName() + "{" +
+        return this.getClass().getSimpleName() + "@" + this.hashCode() + "{" +
                "fromGroup=" + getFromGroup() +
                ", fromQQ=" + getFromQQ() +
                ", message='" + getMessage() + '\'' +
--- a/src/main/java/net/lamgc/cgj/bot/framework/cli/ConsoleMain.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/cli/ConsoleMain.java
@ -31,7 +31,7 @@ public class ConsoleMain {
        long groupId = Long.parseLong(lineReader.readLine("会话群组号:"));
        boolean isGroup = false;
        do {
-            String input = lineReader.readLine("App " + qqId + (isGroup ? "@" + groupId : "$private") + " >");
+            String input = lineReader.readLine("App " + qqId + (isGroup ? "@" + groupId : "#private") + " >");
            if(input.equalsIgnoreCase("#exit")) {
                System.out.println("退出应用...");
                break;
--- a/src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageEvent.java
@ -1,8 +1,8 @@
 package net.lamgc.cgj.bot.framework.cli.message;

 import net.lamgc.cgj.bot.event.MessageEvent;
-
-import java.util.Date;
+import net.lamgc.cgj.bot.message.MessageSenderBuilder;
+import net.lamgc.cgj.bot.message.MessageSource;

 public class ConsoleMessageEvent extends MessageEvent {

@ -11,9 +11,15 @@ public class ConsoleMessageEvent extends MessageEvent {
    }

    @Override
-    public int sendMessage(String message) {
-        System.out.println(new Date() + " Bot: " + message);
-        return 0;
+    public int sendMessage(String message) throws Exception {
+        if(getFromGroup() <= 0) {
+            return MessageSenderBuilder
+                    .getMessageSender(MessageSource.PRIVATE, getFromQQ()).sendMessage(message);
+        } else {
+            return MessageSenderBuilder
+                    .getMessageSender(MessageSource.GROUP, getFromQQ()).sendMessage(message);
+        }
+
    }

    @Override
--- a/src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageSender.java
@ -1,13 +1,26 @@
 package net.lamgc.cgj.bot.framework.cli.message;

 import net.lamgc.cgj.bot.message.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSource;

+import java.text.SimpleDateFormat;
 import java.util.Date;

 public class ConsoleMessageSender implements MessageSender {
+
+    private final static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+    private final MessageSource source;
+    private final long id;
+
+    ConsoleMessageSender(MessageSource source, long id) {
+        this.source = source;
+        this.id = id;
+    }
+
    @Override
    public synchronized int sendMessage(String message) {
-        System.out.println(new Date() + " Bot: " + message);
+        System.out.println(dateFormat.format(new Date()) + " Bot -> " +
+                (source == MessageSource.PRIVATE ? "#"  : "@") + id + ": " + message);
        return 0;
    }
 }
--- a/src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageSenderFactory.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageSenderFactory.java
@ -6,10 +6,8 @@ import net.lamgc.cgj.bot.message.MessageSource;

 public class ConsoleMessageSenderFactory implements MessageSenderFactory {

-    private final static ConsoleMessageSender sender = new ConsoleMessageSender();
-
    @Override
    public MessageSender createMessageSender(MessageSource source, long id) {
-        return sender;
+        return new ConsoleMessageSender(source, id);
    }
 }
--- a/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java
@ -26,13 +26,13 @@ public class SpringCQMessageEvent extends MessageEvent {
        this.cq = Objects.requireNonNull(cq);
        MessageSource source;
        if(messageEvent instanceof CQGroupMessageEvent) {
-            source = MessageSource.Group;
+            source = MessageSource.GROUP;
        } else if (messageEvent instanceof CQDiscussMessageEvent) {
-            source = MessageSource.Discuss;
+            source = MessageSource.DISCUSS;
        } else {
-            source = MessageSource.Private;
+            source = MessageSource.PRIVATE;
        }
-        messageSender = new SpringCQMessageSender(cq, source, source == MessageSource.Private ? getFromQQ() : getFromGroup());
+        messageSender = new SpringCQMessageSender(cq, source, source == MessageSource.PRIVATE ? getFromQQ() : getFromGroup());
    }

    @Override
--- a/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSender.java
@ -6,9 +6,9 @@ import net.lz1998.cq.robot.CoolQ;

 public class SpringCQMessageSender implements MessageSender {

-    private CoolQ coolQ;
-    private MessageSource source;
-    private long target;
+    private final CoolQ coolQ;
+    private final MessageSource source;
+    private final long target;

    public SpringCQMessageSender(CoolQ coolQ, MessageSource source, long target) {
        this.coolQ = coolQ;
@ -19,11 +19,11 @@ public class SpringCQMessageSender implements MessageSender {
    @Override
    public int sendMessage(String message) {
        switch (source) {
-            case Private:
+            case PRIVATE:
                return coolQ.sendPrivateMsg(target, message, false).getData().getMessageId();
-            case Group:
+            case GROUP:
                return coolQ.sendGroupMsg(target, message, false).getData().getMessageId();
-            case Discuss:
+            case DISCUSS:
                return coolQ.sendDiscussMsg(target, message, false).getData().getMessageId();
            default:
                return -1;
--- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java
@ -87,6 +87,7 @@ public class MiraiMain implements Closeable {
     * @param message 消息事件对象
     */
    private void executeMessageEvent(MessageEvent message) {
+        log.debug("Mirai Message: {}", message);
        if(message instanceof GroupMessageEvent) {
            GroupMessageEvent GroupMessageEvent = (GroupMessageEvent) message;
            if(BotEventHandler.isMute(GroupMessageEvent.getGroup().getId(), true) == null) {
--- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java
@ -28,9 +28,9 @@ public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent {
                message.getSender().getId(), getMessageBodyWithoutSource(message.getMessage().toString()));
        this.messageObject = Objects.requireNonNull(message);
        if(message instanceof GroupMessageEvent) {
-            messageSender = new MiraiMessageSender(((GroupMessageEvent) message).getGroup(), MessageSource.Group);
+            messageSender = new MiraiMessageSender(((GroupMessageEvent) message).getGroup(), MessageSource.GROUP);
        } else {
-            messageSender = new MiraiMessageSender(message.getSender(), MessageSource.Private);
+            messageSender = new MiraiMessageSender(message.getSender(), MessageSource.PRIVATE);
        }
    }

@ -45,9 +45,9 @@ public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent {
        super(groupId, qqId, getMessageBodyWithoutSource(message.toString()));
        this.messageObject = Objects.requireNonNull(messageObject, "messageObject is null");
        if(groupId != 0) {
-            this.messageSender = new MiraiMessageSender(((GroupMessageEvent) messageObject).getGroup(), MessageSource.Group);
+            this.messageSender = new MiraiMessageSender(((GroupMessageEvent) messageObject).getGroup(), MessageSource.GROUP);
        } else {
-            this.messageSender = new MiraiMessageSender(messageObject.getSender(), MessageSource.Group);
+            this.messageSender = new MiraiMessageSender(messageObject.getSender(), MessageSource.GROUP);
        }
    }

--- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java
+++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java
@ -40,7 +40,7 @@ public class MiraiMessageSender implements MessageSender {
     * @throws NoSuchElementException 当在机器人好友列表或群列表里没有这个好友或群的时候抛出
     */
    public MiraiMessageSender(Bot bot, MessageSource source, long id) {
-        this(source == MessageSource.Private ? bot.getFriend(id) : bot.getGroup(id), source);
+        this(source == MessageSource.PRIVATE ? bot.getFriend(id) : bot.getGroup(id), source);
    }

    /**
@ -151,7 +151,7 @@ public class MiraiMessageSender implements MessageSender {
                synchronized (imageName) {
                    if(!imageIdCache.exists(imageName) ||
                            Strings.nullToEmpty(code.getParameter("updateCache")) .equalsIgnoreCase("true")) {
-                        log.debug("imageName [{}] 缓存失效或强制更新, 正在更新缓存...", imageName);
+                        log.trace("imageName [{}] 缓存失效或强制更新, 正在更新缓存...", imageName);
                        image = uploadImage0(new File(absolutePath));
                        String cacheExpireAt;
                        long expireTime = 864000000; // 10d
@ -163,13 +163,13 @@ public class MiraiMessageSender implements MessageSender {
                            }
                        }
                        imageIdCache.update(imageName, image.getImageId(), expireTime);
-                        log.debug("imageName [{}] 缓存更新完成.(有效时间: {})", imageName, expireTime);
+                        log.trace("imageName [{}] 缓存更新完成.(有效时间: {})", imageName, expireTime);
                    } else {
-                        log.debug("ImageName: [{}] 缓存命中.", imageName);
+                        log.trace("ImageName: [{}] 缓存命中.", imageName);
                    }
                }
            } else {
-                log.debug("ImageName: [{}] 缓存命中.", imageName);
+                log.trace("ImageName: [{}] 缓存命中.", imageName);
            }

            if(image == null) {
--- a/src/main/java/net/lamgc/cgj/bot/message/MessageSource.java
+++ b/src/main/java/net/lamgc/cgj/bot/message/MessageSource.java
@ -7,17 +7,17 @@ public enum MessageSource {
    /**
     * 私聊消息
     */
-    Private,
+    PRIVATE,
    /**
     * 群组消息
     */
-    Group,
+    GROUP,
    /**
     * 讨论组消息
     */
-    Discuss,
+    DISCUSS,
    /**
     * 未知来源
     */
-    Unknown
+    UNKNOWN
 }
--- a/src/main/java/net/lamgc/cgj/bot/sort/PreLoadDataAttribute.java
+++ b/src/main/java/net/lamgc/cgj/bot/sort/PreLoadDataAttribute.java
@ -0,0 +1,41 @@
+package net.lamgc.cgj.bot.sort;
+
+@SuppressWarnings("unused")
+public enum PreLoadDataAttribute {
+    /**
+     * 按点赞数排序
+     */
+    LIKE("likeCount"),
+
+    /**
+     * 按页面数排序
+     */
+    PAGE("pageCount"),
+
+    /**
+     * 按收藏数排序
+     */
+    BOOKMARK("bookmarkCount"),
+
+    /**
+     * 按评论数排序
+     */
+    COMMENT("commentCount"),
+
+    /**
+     * 不明
+     */
+    RESPONSE("responseCount"),
+
+    /**
+     * 按查看次数排序
+     */
+    VIEW("viewCount"),
+    ;
+
+    public final String attrName;
+
+    PreLoadDataAttribute(String attrName) {
+        this.attrName = attrName;
+    }
+}
--- a/src/main/java/net/lamgc/cgj/bot/sort/PreLoadDataAttributeComparator.java
+++ b/src/main/java/net/lamgc/cgj/bot/sort/PreLoadDataAttributeComparator.java
@ -3,6 +3,8 @@ package net.lamgc.cgj.bot.sort;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import net.lamgc.cgj.bot.cache.CacheStoreCentral;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import java.io.IOException;
 import java.util.Comparator;
@ -10,11 +12,13 @@ import java.util.Comparator;
 /**
 * 收藏数比较器
 */
-public class PreLoadDataComparator implements Comparator<JsonElement> {
+public class PreLoadDataAttributeComparator implements Comparator<JsonElement> {

-    private final Attribute attribute;
+    private final static Logger log = LoggerFactory.getLogger(PreLoadDataAttributeComparator.class);

-    public PreLoadDataComparator(Attribute attribute) {
+    private final PreLoadDataAttribute attribute;
+
+    public PreLoadDataAttributeComparator(PreLoadDataAttribute attribute) {
        this.attribute = attribute;
    }

@ -39,57 +43,17 @@ public class PreLoadDataComparator implements Comparator<JsonElement> {
            }
        }
        try {
-            JsonObject illustPreLoadData1 =
-                    CacheStoreCentral.getIllustPreLoadData(o1.getAsJsonObject().get("illustId").getAsInt(), false);
-            JsonObject illustPreLoadData2 =
-                    CacheStoreCentral.getIllustPreLoadData(o2.getAsJsonObject().get("illustId").getAsInt(), false);
+            JsonObject illustPreLoadData1 = CacheStoreCentral.getCentral()
+                    .getIllustPreLoadData(o1.getAsJsonObject().get("illustId").getAsInt(), false);
+            JsonObject illustPreLoadData2 = CacheStoreCentral.getCentral()
+                    .getIllustPreLoadData(o2.getAsJsonObject().get("illustId").getAsInt(), false);
            return Integer.compare(
                    illustPreLoadData2.get(attribute.attrName).getAsInt(),
                    illustPreLoadData1.get(attribute.attrName).getAsInt());
        } catch (IOException e) {
-            e.printStackTrace();
+            log.error("获取预加载数据失败", e);
            return 0;
        }
    }

-    public enum Attribute {
-        /**
-         * 按点赞数排序
-         */
-        LIKE("likeCount"),
-
-        /**
-         * 按页面数排序
-         */
-        PAGE("pageCount"),
-
-        /**
-         * 按收藏数排序
-         */
-        BOOKMARK("bookmarkCount"),
-
-        /**
-         * 按评论数排序
-         */
-        COMMENT("commentCount"),
-
-        /**
-         * 不明
-         */
-        RESPONSE("responseCount"),
-
-        /**
-         * 按查看次数排序
-         */
-        VIEW("viewCount"),
-        ;
-
-        public final String attrName;
-
-        Attribute(String attrName) {
-            this.attrName = attrName;
-        }
-    }
-
-
 }
--- a/src/main/java/net/lamgc/cgj/bot/cache/exception/HttpRequestException.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/exception/HttpRequestException.java
@ -1,4 +1,4 @@
-package net.lamgc.cgj.bot.cache.exception;
+package net.lamgc.cgj.exception;

 import java.io.IOException;
 import java.util.Objects;
--- a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java
+++ b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java
@ -6,6 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import io.netty.handler.codec.http.HttpHeaderNames;
+import net.lamgc.cgj.exception.HttpRequestException;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
@ -31,6 +32,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;

+@SuppressWarnings("ALL")
 public class PixivDownload {

    private final static Logger log = LoggerFactory.getLogger(PixivDownload.class);
@ -115,10 +117,10 @@ public class PixivDownload {
                }
            }
        } while(!document.select(".pager-container>.next").isEmpty());
-        log.debug("获取完成.");
+        log.trace("获取完成.");
        AtomicInteger count = new AtomicInteger(1);
        linkList.forEach(link -> {
-            log.debug("Next Link [{}]: {}", count.getAndIncrement(), link);
+            log.trace("Next Link [{}]: {}", count.getAndIncrement(), link);
            InputStream imageInputStream = null;
            int tryCount = 0;
            do {
@ -133,9 +135,9 @@ public class PixivDownload {
            } while(imageInputStream == null);

            try(InputStream imageInput = new BufferedInputStream(imageInputStream, 256 * 1024)) {
-                log.debug("调用回调方法...");
+                log.trace("调用回调方法...");
                fn.accept(link, imageInput);
-                log.debug("回调方法调用完成.");
+                log.trace("回调方法调用完成.");
            } catch (IOException e) {
                log.error("图片获取失败", e);
            }
@ -219,8 +221,8 @@ public class PixivDownload {
            int authorId = rankInfo.get("user_id").getAsInt();
            String authorName = rankInfo.get("user_name").getAsString();
            String title = rankInfo.get("title").getAsString();
-            log.debug("当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range - 1, range, illustId, authorId, authorName, title);
-            log.debug("正在获取PagesLink...");
+            log.trace("当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range - 1, range, illustId, authorId, authorName, title);
+            log.trace("正在获取PagesLink...");
            List<String> linkList;
            try {
                linkList = getIllustAllPageDownload(httpClient, this.cookieStore, illustId, quality);
@ -235,14 +237,14 @@ public class PixivDownload {
            log.debug("PagesLink 获取完成, 总数: {}", linkList.size());
            for (int pageIndex = 0; pageIndex < linkList.size(); pageIndex++) {
                String downloadLink = linkList.get(pageIndex);
-                log.debug("当前Page: {}/{}", pageIndex + 1, linkList.size());
+                log.trace("当前Page: {}/{}", pageIndex + 1, linkList.size());
                try(InputStream imageInputStream = new BufferedInputStream(getImageAsInputStream(HttpClientBuilder.create().build(), downloadLink), 256 * 1024)) {
                    fn.download(rank, downloadLink, rankInfo.deepCopy(), imageInputStream);
                } catch(IOException e) {
                    log.error("下载插画时发生异常", e);
                    return;
                }
-                log.debug("完成.");
+                log.trace("完成.");
            }
        });
    }
@ -265,7 +267,7 @@ public class PixivDownload {
            int authorId = rankInfo.get("user_id").getAsInt();
            String authorName = rankInfo.get("user_name").getAsString();
            String title = rankInfo.get("title").getAsString();
-            log.debug("Array-当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range, range, illustId, authorId, authorName, title);
+            log.trace("Array-当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range, range, illustId, authorId, authorName, title);
            results.add(rankInfo);
        }
        log.debug("JsonArray读取完成.");
@ -320,12 +322,12 @@ public class PixivDownload {
        boolean canNext = true;
        for (int pageIndex = startPages; canNext && pageIndex <= endPages && count < range; pageIndex++) {
            HttpGet request = createHttpGetRequest(PixivURL.getRankingLink(contentType, mode, time, pageIndex, true));
-            log.debug("RequestUri: {}", request.getURI());
+            log.trace("RequestUri: {}", request.getURI());
            HttpResponse response = httpClient.execute(request);
            String responseBody = EntityUtils.toString(response.getEntity());
-            log.debug("ResponseBody: {}", responseBody);
+            log.trace("ResponseBody: {}", responseBody);
            if(response.getStatusLine().getStatusCode() != 200) {
-                throw new IOException("Http Response Error: '" + response.getStatusLine() + "', ResponseBody: '" + responseBody + '\'');
+                throw new HttpRequestException(response.getStatusLine(), responseBody);
            }

            JsonObject resultObject = gson.fromJson(responseBody, JsonObject.class);
@ -352,7 +354,7 @@ public class PixivDownload {
        HttpResponse response = httpClient.execute(request);

        if(response.getStatusLine().getStatusCode() != 200) {
-            throw new IOException("Http响应码非200: " + response.getStatusLine());
+            throw new HttpRequestException(response);
        }

        Document document = Jsoup.parse(EntityUtils.toString(response.getEntity()));
@ -399,8 +401,8 @@ public class PixivDownload {

        if(resultObject.get("error").getAsBoolean()) {
            String message = resultObject.get("message").getAsString();
-            log.debug("请求错误, 错误信息: {}", message);
-            throw new IOException(message);
+            log.warn("作品页面接口请求错误, 错误信息: {}", message);
+            throw new HttpRequestException(response);
        }

        JsonArray linkArray = resultObject.getAsJsonArray("body");
@ -473,9 +475,11 @@ public class PixivDownload {
        request.addHeader(HttpHeaderNames.REFERER.toString(), referer);

        HttpResponse response = httpClient.execute(request);
-        log.debug("response: {}", response);
-        log.debug("Content Length: {}KB", Float.parseFloat(response.getFirstHeader(HttpHeaderNames.CONTENT_LENGTH.toString()).getValue()) / 1024F);
-        log.debug("{}", response.getFirstHeader(HttpHeaderNames.CONTENT_TYPE.toString()));
+        log.trace("response: {}", response);
+        log.trace("Content Length: {}KB",
+                Float.parseFloat(response.getFirstHeader(HttpHeaderNames.CONTENT_LENGTH.toString()).getValue()) / 1024F
+        );
+        log.trace(response.getFirstHeader(HttpHeaderNames.CONTENT_TYPE.toString()).toString());
        return response.getEntity().getContent();
    }

@ -496,51 +500,12 @@ public class PixivDownload {
        } else {
            return false;
        }
-
    }

    /**
     * 获取作品信息
     * @param illustId 作品ID
-     * @return 成功获取返回JsonObject, 失败返回null, <br/>
-     *      Json示例: <br/>
-     *      <pre>
-     *          {
-     *         "illustId": "79584670",
-     *         "illustTitle": "このヤンキーはウブすぎる",
-     *         "id": "79584670",
-     *         "title": "このヤンキーはウブすぎる",
-     *         "illustType": 1,
-     *         "xRestrict": 0,
-     *         "restrict": 0,
-     *         "sl": 2,
-     *         "url": "https://i.pximg.net/c/360x360_70/img-master/img/2020/02/19/00/38/23/79584670_p0_square1200.jpg",
-     *         "description": "",
-     *         "tags": [
-     *           "漫画",
-     *           "オリジナル",
-     *           "創作",
-     *           "創作男女",
-     *           "コロさん、ポリさん此方です!",
-     *           "恋の予感",
-     *           "あまずっぺー",
-     *           "交換日記",
-     *           "続編希望!!",
-     *           "オリジナル10000users入り"
-     *         ],
-     *         "userId": "4778293",
-     *         "userName": "隈浪さえ",
-     *         "width": 3288,
-     *         "height": 4564,
-     *         "pageCount": 4,
-     *         "isBookmarkable": true,
-     *         "bookmarkData": null,
-     *         "alt": "#オリジナル このヤンキーはウブすぎる - 隈浪さえ的漫画",
-     *         "isAdContainer": false,
-     *         "profileImageUrl": "https://i.pximg.net/user-profile/img/2019/12/04/18/56/19/16639046_fea29ce38ea89b0cb2313b40b3a72f9a_50.jpg",
-     *         "type": "illust"
-     *       }
-     *      </pre>
+     * @return 成功获取返回JsonObject, 失败返回null.
     * @throws IOException 当请求发生异常, 或接口返回错误信息时抛出.
     * @throws NoSuchElementException 当该作品不存在时抛出异常
     */
@ -548,11 +513,11 @@ public class PixivDownload {
        HttpGet request = createHttpGetRequest(PixivURL.getPixivIllustInfoAPI(illustId));
        HttpResponse response = httpClient.execute(request);
        String responseStr = EntityUtils.toString(response.getEntity());
-        log.debug("Response Content: {}", responseStr);
+        log.trace("Response Content: {}", responseStr);
        JsonObject responseObj = new Gson().fromJson(responseStr, JsonObject.class);

        if(responseObj.get("error").getAsBoolean()) {
-            throw new IOException(responseObj.get("message").getAsString());
+            throw new HttpRequestException(response.getStatusLine(), responseStr);
        }

        JsonArray illustsArray = responseObj.getAsJsonObject("body").getAsJsonArray("illusts");
--- a/src/main/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilder.java
+++ b/src/main/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilder.java
@ -15,8 +15,8 @@ import java.util.Objects;
 * @author LamGC
 * @see PixivURL#PIXIV_SEARCH_CONTENT_URL
 */
-@SuppressWarnings("ALL")
-public class PixivSearchBuilder {
+@SuppressWarnings("unused")
+public class PixivSearchLinkBuilder {

    private final String content;

@ -26,8 +26,8 @@ public class PixivSearchBuilder {
    private SearchOrder searchOrder = SearchOrder.DATE_D;
    private SearchContentOption searchContentOption = SearchContentOption.ALL;

-    private HashSet<String> includeKeywords = new HashSet<>(0);
-    private HashSet<String> excludeKeywords = new HashSet<>(0);
+    private final HashSet<String> includeKeywords = new HashSet<>(0);
+    private final HashSet<String> excludeKeywords = new HashSet<>(0);

    private int page = 1;

@ -42,7 +42,7 @@ public class PixivSearchBuilder {
    private Date startDate = null;
    private Date endDate = null;

-    public PixivSearchBuilder(String searchContent) {
+    public PixivSearchLinkBuilder(String searchContent) {
        this.content = Objects.requireNonNull(searchContent);
    }

@ -99,7 +99,7 @@ public class PixivSearchBuilder {
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
-        PixivSearchBuilder that = (PixivSearchBuilder) o;
+        PixivSearchLinkBuilder that = (PixivSearchLinkBuilder) o;
        return page == that.page &&
                wgt == that.wgt &&
                hgt == that.hgt &&
@ -141,7 +141,7 @@ public class PixivSearchBuilder {

    @Override
    public String toString() {
-        return "PixivSearchBuilder{" +
+        return "PixivSearchLinkBuilder{" +
                "content='" + content + '\'' +
                ", searchArea=" + searchArea +
                ", searchMode=" + searchMode +
@ -161,19 +161,11 @@ public class PixivSearchBuilder {
                '}';
    }

-    public PixivSearchBuilder setSearchArea(SearchArea searchArea) {
+    public PixivSearchLinkBuilder setSearchArea(SearchArea searchArea) {
        this.searchArea = Objects.requireNonNull(searchArea);
        return this;
    }

-    /**
-     * 获取搜索区域
-     * @return 返回搜索区域对象
-     */
-    public SearchArea getSearchArea() {
-        return searchArea;
-    }
-
    /**
     * 获取搜索条件.
     * @return 搜索条件内容
@ -202,50 +194,50 @@ public class PixivSearchBuilder {
        return searchContent.toString();
    }

-    public PixivSearchBuilder setSearchMode(SearchMode searchMode) {
+    public PixivSearchLinkBuilder setSearchMode(SearchMode searchMode) {
        this.searchMode = Objects.requireNonNull(searchMode);
        return this;
    }

-    public PixivSearchBuilder setSearchType(SearchType searchType) {
+    public PixivSearchLinkBuilder setSearchType(SearchType searchType) {
        this.searchType = Objects.requireNonNull(searchType);
        return this;
    }

-    public PixivSearchBuilder setSearchOrder(SearchOrder searchOrder) {
+    public PixivSearchLinkBuilder setSearchOrder(SearchOrder searchOrder) {
        this.searchOrder = Objects.requireNonNull(searchOrder);
        return this;
    }

-    public PixivSearchBuilder setSearchContentOption(SearchContentOption searchContentOption) {
+    public PixivSearchLinkBuilder setSearchContentOption(SearchContentOption searchContentOption) {
        this.searchContentOption = Objects.requireNonNull(searchContentOption);
        return this;
    }

-    public PixivSearchBuilder setRatioOption(RatioOption ratioOption) {
+    public PixivSearchLinkBuilder setRatioOption(RatioOption ratioOption) {
        this.ratioOption = Objects.requireNonNull(ratioOption);
        return this;
    }

-    public PixivSearchBuilder setDateRange(Date startDate, Date endDate) {
+    public PixivSearchLinkBuilder setDateRange(Date startDate, Date endDate) {
        this.startDate = startDate;
        this.endDate = endDate;
        return this;
    }

-    public PixivSearchBuilder setMaxSize(int width, int height) {
+    public PixivSearchLinkBuilder setMaxSize(int width, int height) {
        this.wgt = width;
        this.hgt = height;
        return this;
    }

-    public PixivSearchBuilder setMinSize(int width, int height) {
+    public PixivSearchLinkBuilder setMinSize(int width, int height) {
        this.wlt = width;
        this.hlt = height;
        return this;
    }

-    public PixivSearchBuilder setPage(int pageIndex) {
+    public PixivSearchLinkBuilder setPage(int pageIndex) {
        if (pageIndex <= 0) {
            throw new IllegalArgumentException("Invalid pageIndex: " + pageIndex);
        }
@ -253,22 +245,22 @@ public class PixivSearchBuilder {
        return this;
    }

-    public PixivSearchBuilder addExcludeKeyword(String keyword) {
+    public PixivSearchLinkBuilder addExcludeKeyword(String keyword) {
        excludeKeywords.add(keyword);
        return this;
    }

-    public PixivSearchBuilder removeExcludeKeyword(String keyword) {
+    public PixivSearchLinkBuilder removeExcludeKeyword(String keyword) {
        excludeKeywords.remove(keyword);
        return this;
    }

-    public PixivSearchBuilder addIncludeKeyword(String keyword) {
+    public PixivSearchLinkBuilder addIncludeKeyword(String keyword) {
        includeKeywords.add(keyword);
        return this;
    }

-    public PixivSearchBuilder removeIncludeKeyword(String keyword) {
+    public PixivSearchLinkBuilder removeIncludeKeyword(String keyword) {
        includeKeywords.remove(keyword);
        return this;
    }
--- a/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java
+++ b/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java
@ -10,55 +10,56 @@ import java.util.GregorianCalendar;
 * 目前已整理的一些Pixiv接口列表
 */
@SuppressWarnings("unused")
-public class PixivURL {
+public final class PixivURL {

+    private PixivURL() {}

-    public static final String PIXIV_INDEX_URL = "https://www.pixiv.net";
+    public final static String PIXIV_INDEX_URL = "https://www.pixiv.net";

    /**
     * P站预登陆url
     */
-    public static final String PIXIV_LOGIN_PAGE_URL = "https://accounts.pixiv.net/login?lang=zh&source=pc&view_type=page&ref=wwwtop_accounts_index";
+    public final static String PIXIV_LOGIN_PAGE_URL = "https://accounts.pixiv.net/login?lang=zh&source=pc&view_type=page&ref=wwwtop_accounts_index";

    /**
     * P站登录请求url
     */
-    public static final String PIXIV_LOGIN_URL = "https://accounts.pixiv.net/api/login?lang=zh";
+    public final static String PIXIV_LOGIN_URL = "https://accounts.pixiv.net/api/login?lang=zh";

    /**
     * P站搜索请求url
-     * @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
-     * @see PixivSearchBuilder
+     * @deprecated 该接口已被替换, 请使用{@link PixivSearchLinkBuilder}构造搜索Url
+     * @see PixivSearchLinkBuilder
     */
    @Deprecated
-    private static final String PIXIV_SEARCH_URL = "https://www.pixiv.net/search.php";
+    private final static String PIXIV_SEARCH_URL = "https://www.pixiv.net/search.php";

    /**
     * P站搜索用户url
     * 需要替换的参数:
     * {nick} - 用户昵称、部分名称
-     * @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
-     * @see PixivSearchBuilder
+     * @deprecated 该接口已被替换, 请使用{@link PixivSearchLinkBuilder}构造搜索Url
+     * @see PixivSearchLinkBuilder
     */
    @Deprecated
-    public static final String PIXIV_SEARCH_USER_URL = PIXIV_SEARCH_URL + "?s_mode=s_usr&nick={nick}";
+    public final static String PIXIV_SEARCH_USER_URL = PIXIV_SEARCH_URL + "?s_mode=s_usr&nick={nick}";

    /**
     * P站搜索插画url
     * 需要替换的参数:
     * {word} - 插画相关文本
-     * @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
-     * @see PixivSearchBuilder
+     * @deprecated 该接口已被替换, 请使用{@link PixivSearchLinkBuilder}构造搜索Url
+     * @see PixivSearchLinkBuilder
     */
    @Deprecated
-    public static final String PIXIV_SEARCH_TAG_URL = PIXIV_SEARCH_URL + "?s_mode=s_tag&word={word}";
+    public final static String PIXIV_SEARCH_TAG_URL = PIXIV_SEARCH_URL + "?s_mode=s_tag&word={word}";

    /**
     * P站插图下载链接获取url
     * 需要替换的文本:
     * {illustId} - 插画ID
     */
-    public static final String PIXIV_ILLUST_API_URL = "https://www.pixiv.net/ajax/illust/{illustId}/pages";
+    public final static String PIXIV_ILLUST_API_URL = "https://www.pixiv.net/ajax/illust/{illustId}/pages";

    /**
     * P站用户插图列表获取API
@ -67,42 +68,42 @@ public class PixivURL {
     * {userId} - 用户ID
     */
    //{"error":false,"message":"","body":{"illusts":{"74369837":null,"70990542":null,"70608653":null,"69755191":null,"69729450":null,"69729416":null,"69503608":null,"69288766":null,"69083882":null,"69051458":null,"68484200":null,"68216927":null,"68216866":null,"68192333":null,"67915106":null,"67914932":null,"67854803":null,"67854745":null,"67854670":null,"67787211":null,"67772199":null,"67770637":null,"67754861":null,"67754804":null,"67754726":null,"67740486":null,"67740480":null,"67740450":null,"67740434":null,"67726337":null,"67499196":null,"67499163":null,"67499145":null,"67499111":null,"67499085":null,"67499038":null,"67498987":null,"67473178":null,"66271465":null,"63682753":null,"63682697":null,"59385148":null,"59383265":null,"59383240":null,"59383227":null,"59383173":null},"manga":[],"novels":[],"mangaSeries":[],"novelSeries":[],"pickup":[],"bookmarkCount":{"public":{"illust":1,"novel":0},"private":{"illust":0,"novel":0}}}}
-    public static final String PIXIV_USER_ILLUST_LIST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/all";
+    public final static String PIXIV_USER_ILLUST_LIST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/all";

    /**
     * 能够同时获取插图信息的用户插图列表获取API
     * 需要替换的文本:
     * {userId} - 用户ID
     */
-    public static final String PIXIV_USER_TOP_ILLUST_LIST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/top";
+    public final static String PIXIV_USER_TOP_ILLUST_LIST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/top";

    /**
     * P站单图详情页url
     * 需要替换的文本:
     * {illustId} - 插画ID
     */
-    public static final String PIXIV_ILLUST_MEDIUM_URL = "https://www.pixiv.net/member_illust.php?mode=medium&illust_id={illustId}";
+    public final static String PIXIV_ILLUST_MEDIUM_URL = "https://www.pixiv.net/member_illust.php?mode=medium&illust_id={illustId}";

    /**
     * P站多图详情页url
     * 需要替换的文本:
     * {illustId} - 插画ID
     */
-    public static final String PIXIV_ILLUST_MANGA_URL = "https://www.pixiv.net/member_illust.php?mode=manga&illust_id={illustId}";
+    public final static String PIXIV_ILLUST_MANGA_URL = "https://www.pixiv.net/member_illust.php?mode=manga&illust_id={illustId}";

    /**
     * P站用户页面url
     * 需要替换的文本:
     * {userId} - 用户ID
     */
-    public static final String PIXIV_USER_URL = "https://www.pixiv.net/member.php?id={userId}";
+    public final static String PIXIV_USER_URL = "https://www.pixiv.net/member.php?id={userId}";

    /**
     * P站插图信息获取API
     * 这个API能获取插图基本信息，但不能获取大小
     * 请使用{@link #getPixivIllustInfoAPI(int[])}获取URL
     */
-    private static final String PIXIV_GET_ILLUST_INFO_URL = "https://www.pixiv.net/ajax/illust/recommend/illusts?";
+    private final static String PIXIV_GET_ILLUST_INFO_URL = "https://www.pixiv.net/ajax/illust/recommend/illusts?";

    /**
     * P站获取用户所有插图ID的Api
@ -110,7 +111,15 @@ public class PixivURL {
     * 需要替换的文本:
     * {userId} - 用户ID
     */
-    public static final String PIXIV_GET_USER_ALL_ILLUST_ID_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/all";
+    public final static String PIXIV_GET_USER_ALL_ILLUST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/all";
+
+    /**
+     * P站获取用户推荐插画及用户基本数据
+     * 这个API能获得作者的部分(推荐)作品, 每个作品有详细数据, 还能获取作者主页信息(比如主页说明, 看板图)
+     * 需要替换的文本:
+     * {userId} - 用户ID
+     */
+    public final static String PIXIV_GET_USER_TOP_ILLUST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/top";

    /**
     * P站标签搜索URL
@ -118,7 +127,7 @@ public class PixivURL {
     * 需要替换的文本:
     * {content} - 大致tag内容
     */
-    public static final String PIXIV_TAG_SEARCH_URL = "https://www.pixiv.net/ajax/search/tags/{content}";
+    public final static String PIXIV_TAG_SEARCH_URL = "https://www.pixiv.net/ajax/search/tags/{content}";

    /**
     * 获取动图下载链接和拼接数据.
@ -128,11 +137,17 @@ public class PixivURL {
     */
    public final static String PIXIV_GET_UGOIRA_META_URL = "https://www.pixiv.net/ajax/illust/{illustId}/ugoira_meta";

+    /**
+     * 获取自己帐号的部分数据(目前仅能获取: 关注数, 粉丝数和看板图)
+     * 需要登录.
+     */
+    public final static String PIXIV_GET_USER_EXTRA_URL = "https://www.pixiv.net/ajax/user/extra";
+
    /**
     * 请求时带上需要退出的Cookies
     * 无论成功与否都会返回302重定向到{@linkplain #PIXIV_LOGIN_PAGE_URL 登录页面}
     */
-    public static final String PIXIV_LOGOUT_URL = "https://www.pixiv.net/logout.php";
+    public final static String PIXIV_LOGOUT_URL = "https://www.pixiv.net/logout.php";

    /**
     * 构造P站获取插图信息的Api Url
@ -279,7 +294,7 @@ public class PixivURL {

    /**
     * Pixiv搜索接口.<br/>
-     * 要使用该链接请使用{@link PixivSearchBuilder}构造链接.<br/>
+     * 要使用该链接请使用{@link PixivSearchLinkBuilder}构造链接.<br/>
     * 需要替换的参数: <br/>
     * content - 搜索内容
     */
--- a/src/main/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilder.java
+++ b/src/main/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilder.java
@ -7,6 +7,7 @@ import com.squareup.gifencoder.GifEncoder;
 import com.squareup.gifencoder.Image;
 import com.squareup.gifencoder.ImageOptions;
 import io.netty.handler.codec.http.HttpHeaderNames;
+import net.lamgc.cgj.exception.HttpRequestException;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
@ -46,12 +47,12 @@ public final class PixivUgoiraBuilder {
        log.debug("Request Url: {}", request.getURI());
        HttpResponse response = httpClient.execute(request);
        String bodyStr = EntityUtils.toString(response.getEntity());
-        log.debug("JsonBodyStr: {}", bodyStr);
+        log.trace("JsonBodyStr: {}", bodyStr);
        JsonObject resultObject = new Gson().fromJson(bodyStr, JsonObject.class);
        if(resultObject.get("error").getAsBoolean()) {
            String message = resultObject.get("message").getAsString();
            log.error("获取动图元数据失败!(接口报错: {})", message);
-            throw new IOException(message);
+            throw new HttpRequestException(response.getStatusLine(), bodyStr);
        } else if(!resultObject.has("body")) {
            String message = "接口返回数据不存在body属性, 可能接口发生改变!";
            log.error(message);
@ -173,15 +174,15 @@ public final class PixivUgoiraBuilder {
    private void getUgoiraImageSize() throws IOException {
        log.debug("正在从Pixiv获取动图尺寸...");
        HttpGet request = new HttpGet(PixivURL.getPixivIllustInfoAPI(illustId));
-        log.debug("Request Url: {}", request.getURI());
+        log.trace("Request Url: {}", request.getURI());
        HttpResponse response = httpClient.execute(request);
        String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-        log.debug("ResponseBody: {}", responseBody);
+        log.trace("ResponseBody: {}", responseBody);
        JsonObject resultObject = new Gson().fromJson(responseBody, JsonObject.class);
        if(resultObject.get("error").getAsBoolean()) {
            String message = resultObject.get("message").getAsString();
            log.error("接口返回错误: {}", message);
-            throw new IOException(message);
+            throw new HttpRequestException(response.getStatusLine(), responseBody);
        }

        JsonArray illustsArray = resultObject.getAsJsonObject("body").getAsJsonArray("illusts");
--- a/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java
+++ b/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java
@ -1,149 +0,0 @@
-package net.lamgc.cgj.proxy;
-
-import com.github.monkeywie.proxyee.intercept.HttpProxyIntercept;
-import com.github.monkeywie.proxyee.intercept.HttpProxyInterceptInitializer;
-import com.github.monkeywie.proxyee.intercept.HttpProxyInterceptPipeline;
-import com.github.monkeywie.proxyee.intercept.common.CertDownIntercept;
-import com.github.monkeywie.proxyee.proxy.ProxyConfig;
-import com.github.monkeywie.proxyee.server.HttpProxyServer;
-import com.github.monkeywie.proxyee.server.HttpProxyServerConfig;
-import io.netty.channel.Channel;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.HttpResponse;
-import org.apache.http.client.CookieStore;
-import org.apache.http.impl.cookie.BasicClientCookie;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.HttpCookie;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 登录成功后提供CookieStore, 然后由程序自动登录Pixiv
- * @author LamGC
- */
-public class PixivAccessProxyServer {
-
-    private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class);
-
-    private final HttpProxyServer proxyServer;
-
-    private final CookieStore cookieStore;
-
-    public PixivAccessProxyServer(CookieStore cookieStore){
-        this(cookieStore, null);
-    }
-
-    public PixivAccessProxyServer(CookieStore cookieStore, ProxyConfig proxyConfig){
-        HttpProxyServerConfig config = new HttpProxyServerConfig();
-        this.cookieStore = cookieStore;
-        config.setHandleSsl(true);
-        this.proxyServer = new HttpProxyServer();
-        this.proxyServer
-                .serverConfig(config)
-                .proxyConfig(proxyConfig)
-                .proxyInterceptInitializer(new HttpProxyInterceptInitializer(){
-                    @Override
-                    public void init(HttpProxyInterceptPipeline pipeline) {
-                        pipeline.addLast(new CertDownIntercept());
-                        pipeline.addLast(new HttpProxyIntercept(){
-
-                            private boolean match(HttpRequest request){
-                                String host = request.headers().get(HttpHeaderNames.HOST);
-                                return host.equalsIgnoreCase("pixiv.net") || host.contains(".pixiv.net");
-                            }
-
-                            @Override
-                            public void beforeRequest(Channel clientChannel, HttpRequest httpRequest, HttpProxyInterceptPipeline pipeline) throws Exception {
-                                log.info("URL: " + httpRequest.headers().get(HttpHeaderNames.HOST) + httpRequest.uri());
-                                if(!match(httpRequest)){
-                                    super.beforeRequest(clientChannel, httpRequest, pipeline);
-                                    return;
-                                }
-                                log.info("正在注入Cookies...");
-                                HttpHeaders requestHeaders = httpRequest.headers();
-                                if(requestHeaders.contains(HttpHeaderNames.COOKIE)){
-                                    log.info("原请求存在自带Cookies, 正在清除Cookies...");
-                                    log.debug("原Cookies: {}", requestHeaders.getAsString(HttpHeaderNames.COOKIE));
-                                    requestHeaders.remove(HttpHeaderNames.COOKIE);
-                                }
-                                StringBuilder cookieBuilder = new StringBuilder();
-                                cookieStore.getCookies().forEach(cookie -> {
-                                    if(cookie.isExpired(new Date())){
-                                        return;
-                                    }
-                                    cookieBuilder.append(cookie.getName()).append("=").append(cookie.getValue()).append("; ");
-                                });
-                                log.info("Cookies构造完成, 结果: " + cookieBuilder.toString());
-                                requestHeaders.add(HttpHeaderNames.COOKIE, cookieBuilder.toString());
-                                log.info("Cookies注入完成.");
-
-                                super.beforeRequest(clientChannel, httpRequest, pipeline);
-                            }
-
-                            @Override
-                            public void afterResponse(Channel clientChannel, Channel proxyChannel, HttpResponse httpResponse, HttpProxyInterceptPipeline pipeline) throws Exception {
-                                if(!match(pipeline.getHttpRequest())){
-                                    super.afterResponse(clientChannel, proxyChannel, httpResponse, pipeline);
-                                    return;
-                                }
-                                log.info("正在更新Response Cookie...(Header Name: " + HttpHeaderNames.SET_COOKIE + ")");
-                                List<String> responseCookies = httpResponse.headers().getAll(HttpHeaderNames.SET_COOKIE);
-                                responseCookies.forEach(value -> {
-                                    /*if(check(value)){
-                                        log.info("黑名单Cookie, 已忽略: " + value);
-                                        return;
-                                    }*/
-                                    log.info("Response Cookie: " + value);
-                                    BasicClientCookie cookie = parseRawCookie(value);
-                                    cookieStore.addCookie(cookie);
-                                });
-                                httpResponse.headers().remove(HttpHeaderNames.SET_COOKIE);
-                                super.afterResponse(clientChannel, proxyChannel, httpResponse, pipeline);
-                            }
-
-                            protected BasicClientCookie parseRawCookie(String rawCookie) {
-                                List<HttpCookie> cookies = HttpCookie.parse(rawCookie);
-                                if (cookies.size() < 1)
-                                    return null;
-                                HttpCookie httpCookie = cookies.get(0);
-                                BasicClientCookie cookie = new BasicClientCookie(httpCookie.getName(), httpCookie.getValue());
-                                if (httpCookie.getMaxAge() >= 0) {
-                                    Date expiryDate = new Date(System.currentTimeMillis() + httpCookie.getMaxAge() * 1000);
-                                    cookie.setExpiryDate(expiryDate);
-                                }
-                                if (httpCookie.getDomain() != null)
-                                    cookie.setDomain(httpCookie.getDomain());
-                                if (httpCookie.getPath() != null)
-                                    cookie.setPath(httpCookie.getPath());
-                                if (httpCookie.getComment() != null)
-                                    cookie.setComment(httpCookie.getComment());
-                                cookie.setSecure(httpCookie.getSecure());
-                                return cookie;
-                            }
-                        });
-                    }
-                });
-    }
-
-    public void start(int port){
-        this.proxyServer.start(port);
-    }
-
-    public void close(){
-        this.proxyServer.close();
-    }
-
-    /**
-     * 导出CookieStore.
-     * 注意!该方法导出的CookieStore不适用于ApacheHttpClient, 如需使用则需要进行转换.
-     * @return CookieStore对象
-     */
-    public CookieStore getCookieStore(){
-        return this.cookieStore;
-    }
-
-}
--- a/src/main/java/net/lamgc/cgj/util/Locker.java
+++ b/src/main/java/net/lamgc/cgj/util/Locker.java
@ -0,0 +1,65 @@
+package net.lamgc.cgj.util;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public final class Locker<K> {
+
+    private final LockerMap<K> fromMap;
+
+    private final K key;
+
+    private final boolean autoDestroy;
+
+    private final AtomicInteger lockCount = new AtomicInteger(0);
+
+    /**
+     * 构造一个锁对象
+     * @param map 所属LockerMap
+     * @param key 所属Key
+     */
+    Locker(LockerMap<K> map, K key, boolean autoDestroy) {
+        this.fromMap = map;
+        this.key = key;
+        this.autoDestroy = autoDestroy;
+    }
+
+    /**
+     * 上锁
+     */
+    public void lock() {
+        lockCount.incrementAndGet();
+    }
+
+    /**
+     * 解锁
+     */
+    public void unlock() {
+        int newValue = lockCount.decrementAndGet();
+        if(newValue <= 0 && autoDestroy) {
+            destroy();
+        }
+    }
+
+    /**
+     * 获取锁对象所属Key
+     */
+    public K getKey() {
+        return key;
+    }
+
+    /**
+     * 销毁锁对象
+     */
+    public void destroy() {
+        fromMap.destroyLocker(this);
+    }
+
+    @Override
+    public String toString() {
+        return "Locker@" + this.hashCode() + "{" +
+                "fromMap=" + fromMap +
+                ", key=" + key +
+                '}';
+    }
+
+}
--- a/src/main/java/net/lamgc/cgj/util/LockerMap.java
+++ b/src/main/java/net/lamgc/cgj/util/LockerMap.java
@ -0,0 +1,31 @@
+package net.lamgc.cgj.util;
+
+import java.util.HashMap;
+
+public class LockerMap<K> {
+
+    private final HashMap<K, Locker<K>> lockerHashMap = new HashMap<>();
+
+    /**
+     * 创建锁
+     * @param key Key
+     * @return 如果Key所属锁存在, 则返回对应锁, 否则返回新锁
+     */
+    public Locker<K> createLocker(K key, boolean autoDestroy) {
+        if(lockerHashMap.containsKey(key)) {
+            return lockerHashMap.get(key);
+        }
+        Locker<K> newLocker = new Locker<>(this, key, autoDestroy);
+        lockerHashMap.put(key, newLocker);
+        return newLocker;
+    }
+
+    /**
+     * 销毁锁
+     * @param locker 锁对象
+     */
+    public void destroyLocker(Locker<K> locker) {
+        lockerHashMap.remove(locker.getKey());
+    }
+
+}
--- a/src/main/java/net/lamgc/cgj/util/TimeLimitThreadPoolExecutor.java
+++ b/src/main/java/net/lamgc/cgj/util/TimeLimitThreadPoolExecutor.java
@ -2,6 +2,7 @@ package net.lamgc.cgj.util;

 import java.util.*;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;

 /**
@ -22,29 +23,53 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {
     */
    private final AtomicLong timeoutCheckInterval = new AtomicLong(100);

-    private final Map<Thread, AtomicLong> workerThreadMap = new Hashtable<>();
+    private final Map<Thread, MonitorInfo> workerThreadMap = new Hashtable<>();

    private final Thread timeoutCheckThread = createTimeoutCheckThread();

-    public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue) {
+    public TimeLimitThreadPoolExecutor(long executeLimitTime,
+                                       int corePoolSize,
+                                       int maximumPoolSize,
+                                       long keepAliveTime,
+                                       TimeUnit unit,
+                                       BlockingQueue<Runnable> workQueue) {
        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
        setInitialTime(executeLimitTime);
        timeoutCheckThread.start();
    }

-    public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory) {
+    public TimeLimitThreadPoolExecutor(long executeLimitTime,
+                                       int corePoolSize,
+                                       int maximumPoolSize,
+                                       long keepAliveTime,
+                                       TimeUnit unit,
+                                       BlockingQueue<Runnable> workQueue,
+                                       ThreadFactory threadFactory) {
        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory);
        setInitialTime(executeLimitTime);
        timeoutCheckThread.start();
    }

-    public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, RejectedExecutionHandler handler) {
+    public TimeLimitThreadPoolExecutor(long executeLimitTime,
+                                       int corePoolSize,
+                                       int maximumPoolSize,
+                                       long keepAliveTime,
+                                       TimeUnit unit,
+                                       BlockingQueue<Runnable> workQueue,
+                                       RejectedExecutionHandler handler) {
        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, handler);
        setInitialTime(executeLimitTime);
        timeoutCheckThread.start();
    }

-    public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory, RejectedExecutionHandler handler) {
+    public TimeLimitThreadPoolExecutor(long executeLimitTime,
+                                       int corePoolSize,
+                                       int maximumPoolSize,
+                                       long keepAliveTime,
+                                       TimeUnit unit,
+                                       BlockingQueue<Runnable> workQueue,
+                                       ThreadFactory threadFactory,
+                                       RejectedExecutionHandler handler) {
        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
        setInitialTime(executeLimitTime);
        timeoutCheckThread.start();
@ -107,14 +132,17 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {
            while (true) {
                try {
                    long interval = this.timeoutCheckInterval.get();
+                    //noinspection BusyWait 用于等待超时
                    Thread.sleep(interval);

                    // 检查是否存在超时的任务
-                    workerThreadMap.forEach((thread, time) -> {
-                        long currentTime = time.getAndAdd(interval);
-                        if(currentTime > executeTimeLimit.get()) {
-                            if(!thread.isInterrupted()) {
+                    final long executeTimeLimit = this.executeTimeLimit.get();
+                    workerThreadMap.forEach((thread, info) -> {
+                        long currentTime = info.getTimeRemaining().getAndAdd(interval);
+                        if(currentTime > executeTimeLimit) {
+                            if(!info.getNotifyInterrupted().get() && !thread.isInterrupted()) {
                                thread.interrupt();
+                                info.getNotifyInterrupted().set(true);
                            }
                        }
                    });
@ -130,7 +158,7 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {

    @Override
    protected void beforeExecute(Thread t, Runnable r) {
-        workerThreadMap.put(t, new AtomicLong());
+        workerThreadMap.put(t, new MonitorInfo());
        super.beforeExecute(t, r);
    }

@ -145,4 +173,20 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {
        this.timeoutCheckThread.interrupt();
        super.terminated();
    }
+
+    private static class MonitorInfo {
+
+        private final AtomicLong timeRemaining = new AtomicLong();
+
+        private final AtomicBoolean notifyInterrupted = new AtomicBoolean(false);
+
+        public AtomicBoolean getNotifyInterrupted() {
+            return notifyInterrupted;
+        }
+
+        public AtomicLong getTimeRemaining() {
+            return timeRemaining;
+        }
+    }
+
 }
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@ -34,6 +34,9 @@
        </Console>

        <RollingFile name="rollingFile" fileName="${logsDir}/latest.log" filePattern="${logsDir}/running.%-d{yyyy-MM-dd_HH-mm-ss}.log.gz">
+            <Filters>
+                <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
+            </Filters>
            <PatternLayout charset="${charset}">
                <MarkerPatternSelector defaultPattern="${standard_pattern}">
                    <PatternMatch key="mirai" pattern="${mirai_pattern}" />
@ -46,7 +49,8 @@
    </Appenders>

    <Loggers>
-        <Root level="TRACE">
+        <Logger level="INFO" name="org.apache.http"/>
+        <Root level="DEBUG">
            <AppenderRef ref="STANDARD_STDOUT"/>
            <AppenderRef ref="STANDARD_STDERR"/>
            <AppenderRef ref="rollingFile"/>
--- a/src/test/java/net/lamgc/cgj/pixiv/PixivSearchBuilderTest.java
+++ b/src/test/java/net/lamgc/cgj/pixiv/PixivSearchBuilderTest.java
@ -1,26 +0,0 @@
-package net.lamgc.cgj.pixiv;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class PixivSearchBuilderTest {
-
-    @Test
-    public void buildTest() {
-        PixivSearchBuilder builder = new PixivSearchBuilder("hololive");
-        //builder.addExcludeKeyword("fubuki").addExcludeKeyword("minato");
-        builder.addIncludeKeyword("35").addIncludeKeyword("okayu").addIncludeKeyword("百鬼あやめ");
-        System.out.println(builder.buildURL());
-    }
-
-    @Test
-    public void equalsTest() {
-        Assert.assertEquals(new PixivSearchBuilder("风景"), new PixivSearchBuilder("风景"));
-    }
-
-    @Test
-    public void hashCodeTest() {
-        Assert.assertEquals(new PixivSearchBuilder("风景").hashCode(), new PixivSearchBuilder("风景").hashCode());
-    }
-
-}
--- a/src/test/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilderTest.java
+++ b/src/test/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilderTest.java
@ -0,0 +1,25 @@
+package net.lamgc.cgj.pixiv;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PixivSearchLinkBuilderTest {
+
+    @Test
+    public void buildTest() {
+        PixivSearchLinkBuilder builder = new PixivSearchLinkBuilder("hololive");
+        builder.addIncludeKeyword("35").addIncludeKeyword("okayu").addIncludeKeyword("百鬼あやめ");
+        System.out.println(builder.buildURL());
+    }
+
+    @Test
+    public void equalsTest() {
+        Assert.assertEquals(new PixivSearchLinkBuilder("风景"), new PixivSearchLinkBuilder("风景"));
+    }
+
+    @Test
+    public void hashCodeTest() {
+        Assert.assertEquals(new PixivSearchLinkBuilder("风景").hashCode(), new PixivSearchLinkBuilder("风景").hashCode());
+    }
+
+}
--- a/src/test/java/net/lamgc/cgj/util/LockerMapTest.java
+++ b/src/test/java/net/lamgc/cgj/util/LockerMapTest.java
@ -0,0 +1,18 @@
+package net.lamgc.cgj.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class LockerMapTest {
+
+    @Test
+    public void createAndFinalizeTest() {
+        LockerMap<String> map = new LockerMap<>();
+        Locker<String> locker = map.createLocker("Test", true);
+        Assert.assertEquals(locker, map.createLocker("Test", true));
+        locker.lock();
+        locker.unlock();
+        System.gc();
+    }
+
+}
--- a/src/test/java/net/lamgc/cgj/util/TimeLimitThreadPoolExecutorTest.java
+++ b/src/test/java/net/lamgc/cgj/util/TimeLimitThreadPoolExecutorTest.java
@ -2,26 +2,37 @@ package net.lamgc.cgj.util;

 import org.junit.Assert;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;

 public class TimeLimitThreadPoolExecutorTest {

+    private final static Logger log = LoggerFactory.getLogger(TimeLimitThreadPoolExecutorTest.class);
+
    @Test
    public void timeoutTest() throws InterruptedException {
        TimeLimitThreadPoolExecutor executor = new TimeLimitThreadPoolExecutor(1000, 1, 1, 30, TimeUnit.SECONDS, new ArrayBlockingQueue<>(50));
-        System.out.println(executor.isTerminated());
-        System.out.println(executor.isShutdown());
+        log.info("ThreadPoolExecutor.isTerminated: {}", executor.isTerminated());
+        log.info("ThreadPoolExecutor.isShutdown: {}", executor.isShutdown());

        executor.setTimeoutCheckInterval(150);
-        System.out.println("当前设定: ETL: " + executor.getExecuteTimeLimit() + "ms, TCI: " + executor.getTimeoutCheckInterval() + "ms");
+        log.info("当前设定: ExecuteTimeLimit: {}ms, CheckInterval: {}ms", executor.getExecuteTimeLimit(),
+                executor.getTimeoutCheckInterval());
        executor.execute(() -> {
            try {
-                Thread.sleep(5 * 1000);
+                Thread.sleep(5000);
            } catch (InterruptedException e) {
                System.out.println("线程 " + Thread.currentThread().getName() + " 被中断");
            }
+
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                Assert.fail("Multiple interrupts occurred");
+            }
        });
        executor.shutdown();
        Assert.assertTrue(executor.awaitTermination(5 * 1000, TimeUnit.MILLISECONDS));
Author	SHA1	Message	Date
LamGC	968a616595	[Version] 更新版本(2.5.2-20200618.1-SNAPSHOT -> 2.5.2-20200630.1-SNAPSHOT);	2020-06-30 01:23:04 +08:00
LamGC	6443ba68ab	[Fix] AutoCleanTimer 修复自动清除定时器没有重复工作; [Fix] LocalHashCacheStore 修复clean方法抛出'ConcurrentModificationException'异常的问题; [Change] CacheStoreCentral 调整PreLoadData的热点缓存时间; [Change] HotDataCacheStore 将最近获取的Key重置其过期时间, 调整clean过程;	2020-06-30 01:21:17 +08:00
LamGC	cbe0a38f59	Merge branch 'master' of github.com:LamGC/ContentGrabbingJi	2020-06-29 23:33:41 +08:00
LamGC	eadfacb7d0	[Clear] PixivSearchLinkBuilder 清理代码;	2020-06-23 13:53:54 +08:00
LamGC	572189d906	[Change] Main 增加'buildPassword'命令用于构造加密后的密码, 移除对PixivLoginProxyServer的嵌入支持; [Delete] pom.xml 移除依赖项'net.lamgc:PixivLoginProxyServer';	2020-06-23 10:02:47 +08:00
LamGC	811694587d	[Version] 更新版本(2.5.2-20200617.1-SNAPSHOT -> 2.5.2-20200618.1-SNAPSHOT);	2020-06-18 19:27:11 +08:00
LamGC	419f2de055	[Add] BotEventHandler 设计在消息正在发送,被时限线程池中断时, 重新投递事件以重新发送消息;	2020-06-18 10:11:08 +08:00
LamGC	368c78e171	[Add] CacheStoreCentral, BotCommandProcess Search命令增加对pageIndex参数使用(之前竟然是个摆设!?);	2020-06-18 10:05:34 +08:00
LamGC	bccf47db6e	[Change] MessageEvent toString方法增加hashCode输出;	2020-06-18 09:35:37 +08:00
LamGC	cf351074cc	[Delete] BufferMessageEvent 移除缓冲消息事件; [Add] BufferedMessageSender 增加缓冲消息发送器, 用于替代BufferMessageEvent; [Change] BotCommandProcess 将Random命令中所使用的BufferMessageEvent替换成BufferedMessageSender;	2020-06-18 09:35:25 +08:00
LamGC	c4ce18d37a	[Fix] log4j2.xml 修复HttpClient日志输出过多的问题; [Change] PixivURL 将PixivURL设计为不可继承且不可实例化;	2020-06-18 09:01:16 +08:00
LamGC	26fd18917d	[Delete] PixivAccessProxyServer 移除弃用的类; [Change] Locker 删除不必要的代码; [Change] PixivDownload 删除多余的Javadoc内容; [Change] TimeLimitThreadPoolExecutorTest 调整日志输出方向, 补充测试细节;	2020-06-17 19:49:36 +08:00
LamGC	acbd990181	[Version] 更新版本(2.5.2-20200611.1-SNAPSHOT -> 2.5.2-20200617.1-SNAPSHOT);	2020-06-17 16:48:47 +08:00
LamGC	6db9cda08a	Merge branch 'optimize-memory-cache'	2020-06-17 16:47:08 +08:00
LamGC	1c742bfb6f	[Fix] TimeLimitThreadPoolExecutor 修复了超时提醒遭到时限线程池中断的问题, 调整线程池仅发起一次中断;	2020-06-17 16:14:32 +08:00
LamGC	2f30fe1696	[Change] CacheStoreCentral 调整PreLoadData的本地缓存时间, 添加注意事项;	2020-06-17 10:51:06 +08:00
LamGC	32db952e63	Merge branch 'master' into optimize-memory-cache	2020-06-15 17:42:51 +08:00
LamGC	bd6b825704	[Fix] pom.xml 排除slf4j-log4j12依赖项以修复package后应用启动报Slf4j实现冲突的问题;	2020-06-15 17:42:31 +08:00
LamGC	3943963505	[Fix] BotEventHandler 修复线程池最大线程数与最低线程数错误, 导致无法启动应用的问题;	2020-06-15 17:40:23 +08:00
LamGC	08822f68eb	[Change] Locker 增加清理日志; [Add] LockerMapTest 增加单元测试;	2020-06-15 17:18:28 +08:00
LamGC	2f647ee9fa	[Add] LockerMap, Locker 增加Locker锁对象和LockerMap锁对象存储; [Change] CacheStoreCentral 将synchronized所使用的的锁对象由String(常量池)转换成Locker<K>以尝试减少内存占用;	2020-06-15 16:22:37 +08:00
LamGC	44a7f49510	[Change] BotGlobal 补充IllegalStateException错误信息;	2020-06-15 15:48:07 +08:00
LamGC	85088e1b2c	[Change] RandomIntervalSendTimer 调整日志输出内容;	2020-06-13 23:10:01 +08:00
LamGC	8dfb858b9f	[Change] RedisPoolCacheStore 优化内部方法实现;	2020-06-13 17:24:06 +08:00
LamGC	0e76cebc31	[Fix] PreLoadDataAttributeComparator 修复获取PreLoadData抛出的异常信息未记录到日志的问题;	2020-06-13 16:51:15 +08:00
LamGC	c64320ad78	[Change] HttpRequestException 统一接口异常, 调整类所在包路径;	2020-06-13 16:44:52 +08:00
LamGC	91e065f657	[Change] ImageCacheStore 优化中断处理, 自动取消任务, 补充TaskState设置;	2020-06-13 12:54:17 +08:00
LamGC	91f8b0070f	[Change] PreLoadDataAttributeComparator 更改类名;	2020-06-13 00:28:52 +08:00
LamGC	ad54dbfbf3	[Change] PreLoadDataComparator, PreLoadDataAttribute 将PreLoadData的属性Enum迁移到单独的类; [Change] BotCommandProcess 适配更改;	2020-06-12 22:28:14 +08:00
LamGC	ebb3dea99e	[Change] ConsoleMessageEvent, ConsoleMessageSender 将消息传递给Sender发送, 设置消息前缀格式; [Change] ConsoleMain 调整私聊模式下的前缀; [Change] MessageSource 规范化命名;	2020-06-12 20:13:36 +08:00
LamGC	abcd26f21b	[Fix] BotEventHandler 修复事件处理线程非预期设置的问题; [Change] BotEventHandler 设置线程超时时间; [Fix] CacheStoreCentral 整理'InterruptedException'在'getImageById'的传递路径;	2020-06-12 20:00:37 +08:00
LamGC	d9b08f8ad9	[Change] BotCommandProcess, CacheStoreCentral 调整个别日志的输出级别;	2020-06-12 19:28:59 +08:00
LamGC	5e030c12b2	[Change] BotCommandProcess 将各命令中'page'参数更名为'p'以简化命令; [Change] PixivSearchLinkBuilder 更改类名(PixivSearchBuilder -> PixivSearchLinkBuilder); [Add] PixivURL 增加接口常量; [Change] Main, CacheStoreCentral, PixivSearchLinkBuilderTest 适配PixivSearchLinkBuilder的更改;	2020-06-12 17:06:04 +08:00
LamGC	62eabce8f6	[Clear] PixivDownload, RandomIntervalSendTimer 整理代码;	2020-06-12 10:31:16 +08:00
LamGC	64bca3c8f7	[Change] RandomIntervalSendTimer 更改Timer线程名;	2020-06-12 10:20:56 +08:00
LamGC	3b3f97e638	[Fix] CacheStoreCentral 修复Search命令中'option'参数区分大小写的问题; [Fix] BotCommandProcess 修复Search命令中遇到不存在作品时会中断处理的问题; [Change] BotCommandProcess 调整Ranking命令的'type'参数默认值(ILLUST -> ALL);	2020-06-12 10:12:29 +08:00
LamGC	951824cbe2	[Version] 更新版本(2.5.2-20200610.4-SNAPSHOT -> 2.5.2-20200611.1-SNAPSHOT);	2020-06-11 16:47:35 +08:00
LamGC	e104abedeb	[Add] MiraiMain 增加原始消息事件日志信息;	2020-06-11 16:46:32 +08:00
LamGC	c3967d214d	[Change] Dockerfile.sample 提升镜像使用的Jdk版本(8-jre -> 14 jdk), 增加Arthas诊断工具, 优化构建指令顺序;	2020-06-11 10:57:40 +08:00
LamGC	26e377a2c7	[Change] log4j2.xml 调整日志输出到文件的限制; [Change] 将内容较长的日志设为TRACE级别, 以减少日志占用; [CLear] 整理代码;	2020-06-11 09:49:19 +08:00
LamGC	87f2535b48	[Change] BotCommandProcess 优化Tag过滤表达式; [Change] ImageCacheHandler 调整日志输出级别;	2020-06-11 09:08:58 +08:00
LamGC	97d06c4fc3	[Change] CacheStoreCentral 调整代码以为后续更改做准备; [Change] BotCommandProcess, ImageCacheHandler, PreLoadDataComparator, RandomRankingArtworksSender 适配CacheStoreCentral的更改;	2020-06-10 20:21:23 +08:00