[Version] 更新版本(2.5.0-20200506.1-SNAPSHOT -> 2.5.0-20200509.1-SNAPSHOT);

[Update] ImageCache 更新了ImageCache, 将该部分单独分离到 ImageCacheStore;
[Update] BotCommandProcess 适配新的ImageCache, 调整内容检查的时机以减少不必要的API访问;

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.lamgc</groupId>
     <artifactId>ContentGrabbingJi</artifactId>
-    <version>2.5.0-20200506.1-SNAPSHOT</version>
+    <version>2.5.0-20200509.1-SNAPSHOT</version>
 
     <repositories>
         <repository>

src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java

@@ -111,6 +111,30 @@ public class BotAdminCommandProcess {
             @Argument(name = "type", force = false, defaultValue = "ILLUST") String rankingContentType,
             @Argument(name = "original", force = false, defaultValue = "false") boolean original
     ) {
+        if(minTime <= 0 || floatTime <= 0) {
+            return "时间不能为0或负数！";
+        } else if(rankingStart <= 0 || rankingStop - rankingStart <= 0) {
+            return "排行榜范围选取错误！";
+        }
+
+        PixivURL.RankingContentType type;
+        PixivURL.RankingMode mode;
+        try {
+            type = PixivURL.RankingContentType.valueOf("TYPE_" + rankingContentType.toUpperCase());
+        } catch(IllegalArgumentException e) {
+            return "无效的排行榜类型参数！";
+        }
+
+        try {
+            mode = PixivURL.RankingMode.valueOf("MODE_" + rankingMode.toUpperCase());
+        } catch(IllegalArgumentException e) {
+            return "无效的排行榜模式参数！";
+        }
+
+        if(!type.isSupportedMode(mode)) {
+            return "不兼容的排行榜模式与类型！";
+        }
+
         long group = groupId <= 0 ? fromGroup : groupId;
         JsonObject setting = new JsonObject();
         setting.addProperty(RANKING_SETTING_TIME_MIN, minTime);
@@ -127,7 +151,8 @@ public class BotAdminCommandProcess {
             removePushGroup(fromGroup, groupId);
         }
 
-        log.info("正在增加Timer...(Setting: {})", setting);
+        log.info("群组 {} 新推送配置: {}", group, setting);
+        log.info("正在增加Timer...");
         pushInfoMap.put(group, setting);
         addPushTimer(group, setting);
         return "已在 " + group + " 开启定时推送功能。";

src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java

@@ -2,7 +2,6 @@ package net.lamgc.cgj.bot;
 
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.*;
 import io.netty.handler.codec.http.HttpHeaderNames;
 import net.lamgc.cgj.Main;
@@ -15,7 +14,6 @@ import net.lamgc.cgj.pixiv.PixivURL;
 import net.lamgc.cgj.util.URLs;
 import net.lamgc.utils.base.runner.Argument;
 import net.lamgc.utils.base.runner.Command;
-import net.lamgc.utils.event.EventExecutor;
 import net.lz1998.cq.utils.CQCode;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -29,9 +27,6 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter", "SameParameterValue"})
@@ -50,26 +45,12 @@ public class BotCommandProcess {
     private final static CacheStore<JsonElement> illustInfoCache = new JsonRedisCacheStore(BotEventHandler.redisServer, "illustInfo", gson);
     private final static CacheStore<JsonElement> illustPreLoadDataCache = new HotDataCacheStore<>(
             new JsonRedisCacheStore(BotEventHandler.redisServer, "illustPreLoadData", gson),
-            new LocalHashCacheStore<>(), 3600000, 900000);
+            new LocalHashCacheStore<>(), 3600000, 900000, true);
     private final static CacheStore<JsonElement> searchBodyCache = new JsonRedisCacheStore(BotEventHandler.redisServer, "searchBody", gson);
     private final static CacheStore<List<JsonObject>> rankingCache = new JsonObjectRedisListCacheStore(BotEventHandler.redisServer, "ranking", gson);
     private final static CacheStore<List<String>> pagesCache = new StringListRedisCacheStore(BotEventHandler.redisServer, "imagePages");
     public final static CacheStore<JsonElement> reportStore = new JsonRedisCacheStore(BotEventHandler.redisServer, "report", gson);
 
-    /**
-     * 图片异步缓存执行器
-     */
-    private final static EventExecutor imageCacheExecutor = new EventExecutor(new ThreadPoolExecutor(
-            Runtime.getRuntime().availableProcessors() >= 2 ? 2 : 1,
-            (int) Math.ceil(Runtime.getRuntime().availableProcessors() / 2F),
-            5L, TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(128),
-            new ThreadFactoryBuilder()
-                    .setNameFormat("imageCacheThread-%d")
-                    .build(),
-            new ThreadPoolExecutor.DiscardOldestPolicy()
-    ));
-
     private final static RankingUpdateTimer updateTimer = new RankingUpdateTimer();
 
     public static void initialize() {
@@ -77,12 +58,6 @@ public class BotCommandProcess {
 
         SettingProperties.loadProperties();
 
-        try {
-            imageCacheExecutor.addHandler(new ImageCacheHandler());
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-
         updateTimer.schedule(null);
         log.info("初始化完成.");
     }
@@ -129,6 +104,12 @@ public class BotCommandProcess {
         return helpStrBuilder.toString();
     }
 
+    /**
+     * 作品信息查询
+     * @param fromGroup 来源群(系统提供)
+     * @param illustId 作品Id
+     * @return 返回作品信息
+     */
     @Command(commandName = "info")
     public static String artworkInfo(@Argument(name = "$fromGroup") long fromGroup, @Argument(name = "id") int illustId) {
         if(illustId <= 0) {
@@ -164,10 +145,20 @@ public class BotCommandProcess {
         return "尚未支持";
     }
 
+    /**
+     * 排行榜命令
+     * @param fromGroup 来源群(系统提供)
+     * @param queryTime 查询时间, 格式: 年-月-日
+     * @param force 是否强制查询, 当主动提供的时间不在查询范围时, 是否强制查询, 仅系统可用
+     * @param contentMode 内容模式
+     * @param contentType 排行榜类型
+     * @return 返回排行榜信息
+     */
     @Command
     public static String ranking(
             @Argument(name = "$fromGroup") long fromGroup,
             @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
     ) {
@@ -184,7 +175,7 @@ public class BotCommandProcess {
             }
             queryDate = gregorianCalendar.getTime();
         } else {
-            if(new Date().before(queryDate)) {
+            if(new Date().before(queryDate) && !force) {
                 log.warn("查询的日期过早, 无法查询排行榜.");
                 return "查询日期过早, 暂未更新指定日期的排行榜!";
             }
@@ -261,6 +252,10 @@ public class BotCommandProcess {
         return resultBuilder.append("如查询当前时间获取到昨天时间，则今日排名榜未更新。\n如有不当作品，可使用\".cgj report -id 作品id\"向色图姬反馈。").toString();
     }
 
+    /**
+     * 查询指定作者的作品(尚未完成)
+     * @return 返回作者信息和部分作品
+     */
     @Command(commandName = "userArt")
     public static String userArtworks() {
 
@@ -269,6 +264,7 @@ public class BotCommandProcess {
 
     /**
      * 搜索命令
+     * @param fromGroup 来源群(系统提供)
      * @param content 搜索内容
      * @param type 搜索类型
      * @param area 搜索区域
@@ -408,7 +404,7 @@ public class BotCommandProcess {
                 StringBuilder builder = new StringBuilder("[");
                 illustObj.get("tags").getAsJsonArray().forEach(el -> builder.append(el.getAsString()).append(", "));
                 builder.replace(builder.length() - 2, builder.length(), "]");
-                log.debug("{} ({} / {})\n\t作品id: {}, \n\t作者名(作者id): {} ({}), \n\t作品标题: {}, \n\t作品Tags: {}, \n\t页数: {}, \n\t作品链接: {}",
+                log.debug("{} ({} / {})\n\t作品id: {}, \n\t作者名(作者id): {} ({}), \n\t作品标题: {}, \n\t作品Tags: {}, \n\t页数: {}页, \n\t作品链接: {}",
                         searchArea.name(),
                         count,
                         illustsList.size(),
@@ -432,10 +428,20 @@ public class BotCommandProcess {
                     continue;
                 }
 
-                result.append(searchArea.name()).append(" (").append(count).append(" / ").append(limit).append(")\n\t作品id: ").append(illustId)
+                JsonObject illustPreLoadData = 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("\n\t作品页数: ").append(illustObj.get("pageCount").getAsInt()).append("页")
+                        .append("\n\t点赞数：")
+                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt())
+                        .append("\n\t收藏数：")
+                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt())
+                        .append("\n\t围观数：")
+                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt())
+                        .append("\n\t评论数：")
+                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt())
                         .append("\n").append(imageMsg).append("\n");
                 count++;
             }
@@ -446,11 +452,22 @@ public class BotCommandProcess {
         return Strings.nullToEmpty(result.toString()) + "预览图片并非原图，使用“.cgj image -id 作品id”获取原图\n如有不当作品，可使用\".cgj report -id 作品id\"向色图姬反馈。";
     }
 
+    /**
+     * 获取作品页面的下载链接
+     * @param illustId 作品Id
+     * @param quality 画质类型
+     * @return 返回作品所有页面在Pixiv的下载链接(有防盗链, 考虑要不要设置镜像站)
+     */
     @Command(commandName = "pages")
     public static String getPagesList(
+            @Argument(name = "$fromGroup") long fromGroup,
             @Argument(name = "id") int illustId,
             @Argument(name = "quality", force = false) PixivDownload.PageQuality quality) {
         try {
+            if(isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
+                log.warn("来源群 {} 查询的作品Id {} 为R18作品, 根据配置设定, 屏蔽该作品.", fromGroup, illustId);
+                return "该作品已被封印！";
+            }
             List<String> pagesList = PixivDownload.getIllustAllPageDownload(pixivDownload.getHttpClient(), pixivDownload.getCookieStore(), illustId, quality);
             StringBuilder builder = new StringBuilder("作品ID ").append(illustId).append(" 共有").append(pagesList.size()).append("页：").append("\n");
             int index = 0;
@@ -464,6 +481,12 @@ public class BotCommandProcess {
         }
     }
 
+    /**
+     * 获取作品链接
+     * @param fromGroup 来源群(系统提供)
+     * @param illustId 作品Id
+     * @return 返回作品在Pixiv的链接
+     */
     @Command(commandName = "link")
     public static String artworksLink(@Argument(name = "$fromGroup") long fromGroup, @Argument(name = "id") int illustId) {
         try {
@@ -483,6 +506,7 @@ public class BotCommandProcess {
 
     /**
      * 通过illustId获取作品图片
+     * @param fromGroup 来源群(系统提供)
      * @param illustId 作品Id
      * @param quality 图片质量
      * @param pageIndex 指定页面索引, 从1开始
@@ -495,25 +519,6 @@ public class BotCommandProcess {
             @Argument(name = "quality", force = false) PixivDownload.PageQuality quality,
             @Argument(name = "page", force = false, defaultValue = "1") int pageIndex) {
         log.debug("IllustId: {}, Quality: {}, PageIndex: {}", illustId, quality.name(), pageIndex);
-        List<String> pagesList;
-        try {
-            pagesList = getIllustPages(illustId, quality, false);
-        } catch (IOException e) {
-            log.error("获取下载链接列表时发生异常", e);
-            return "发生网络异常，无法获取图片！";
-        }
-
-        if(log.isDebugEnabled()) {
-            StringBuilder logBuilder = new StringBuilder("作品Id {} 所有页面下载链接: \n");
-            AtomicInteger index = new AtomicInteger();
-            pagesList.forEach(item -> logBuilder.append(index.incrementAndGet()).append(". ").append(item).append("\n"));
-            log.debug(logBuilder.toString());
-        }
-
-        if (pagesList.size() < pageIndex || pageIndex <= 0) {
-            log.warn("指定的页数超出了总页数({} / {})", pageIndex, pagesList.size());
-            return "指定的页数超出了范围(总共 " + pagesList.size() + " 页)";
-        }
 
         try {
             if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
@@ -528,6 +533,26 @@ public class BotCommandProcess {
             return "发生网络异常，无法获取图片！";
         }
 
+        List<String> pagesList;
+        try {
+            pagesList = getIllustPages(illustId, quality, false);
+        } catch (IOException e) {
+            log.error("获取下载链接列表时发生异常", e);
+            return "发生网络异常，无法获取图片！";
+        }
+
+        if(log.isDebugEnabled()) {
+            StringBuilder logBuilder = new StringBuilder("作品Id " + illustId + " 所有页面下载链接: \n");
+            AtomicInteger index = new AtomicInteger();
+            pagesList.forEach(item -> logBuilder.append(index.incrementAndGet()).append(". ").append(item).append("\n"));
+            log.debug(logBuilder.toString());
+        }
+
+        if (pagesList.size() < pageIndex || pageIndex <= 0) {
+            log.warn("指定的页数超出了总页数({} / {})", pageIndex, pagesList.size());
+            return "指定的页数超出了范围(总共 " + pagesList.size() + " 页)";
+        }
+
         String downloadLink = pagesList.get(pageIndex - 1);
         String fileName = URLs.getResourceName(Strings.nullToEmpty(downloadLink));
         File imageFile = new File(getImageStoreDir(), downloadLink.substring(downloadLink.lastIndexOf("/") + 1));
@@ -552,12 +577,11 @@ public class BotCommandProcess {
                 }
             }
 
-            ImageCacheObject taskObject = new ImageCacheObject(imageCache, illustId, downloadLink, imageFile);
             try {
-                imageCacheExecutor.executorSync(taskObject);
+                ImageCacheStore.executeCacheRequest(new ImageCacheObject(imageCache, illustId, downloadLink, imageFile));
             } catch (InterruptedException e) {
-                log.error("等待图片下载时发生中断", e);
-                return "图片获取失败!";
+                log.warn("图片缓存被中断", e);
+                return "(错误：图片获取超时)";
             }
         } else {
             log.debug("图片 {} 缓存命中.", fileName);
@@ -603,12 +627,18 @@ public class BotCommandProcess {
 
     /**
      * 举报某一作品
+     * @param fromGroup 来源群(系统提供)
      * @param illustId 需要举报的作品id
      * @param reason 举报原因
      * @return 返回提示信息
      */
     @Command
-    public static String report(@Argument(name = "$fromGroup") long fromGroup, @Argument(name = "$fromQQ") long fromQQ, @Argument(name = "id") int illustId, @Argument(name = "msg", force = false) String reason) {
+    public static String report(
+            @Argument(name = "$fromGroup") long fromGroup,
+            @Argument(name = "$fromQQ") long fromQQ,
+            @Argument(name = "id") int illustId,
+            @Argument(name = "msg", force = false) String reason
+    ) {
         log.warn("收到作品反馈(IllustId: {}, 原因: {})", illustId, reason);
         JsonObject reportJson = new JsonObject();
         reportJson.addProperty("illustId", illustId);

src/main/java/net/lamgc/cgj/bot/RankingUpdateTimer.java

@@ -6,6 +6,7 @@ import net.lamgc.cgj.pixiv.PixivURL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.Calendar;
 import java.util.Date;
@@ -29,8 +30,8 @@ public class RankingUpdateTimer {
         if(cal.get(Calendar.DAY_OF_YEAR) <= currentLocalDate.getDayOfYear() && cal.get(Calendar.HOUR_OF_DAY) >= 12) {
             cal.set(Calendar.DAY_OF_YEAR, currentLocalDate.getDayOfYear() + 1);
         }
-        cal.set(Calendar.HOUR_OF_DAY, 12);
-        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.HOUR_OF_DAY, 11);
+        cal.set(Calendar.MINUTE, 30);
         cal.set(Calendar.SECOND, 0);
         cal.set(Calendar.MILLISECOND, 0);
 
@@ -51,13 +52,14 @@ public class RankingUpdateTimer {
         LocalDate currentLocalDate = LocalDate.now();
         if(calendar.get(Calendar.DAY_OF_YEAR) == currentLocalDate.getDayOfYear() ||
                 calendar.get(Calendar.DAY_OF_YEAR) == currentLocalDate.getDayOfYear() - 1) {
-            if(calendar.get(Calendar.HOUR_OF_DAY) < 12) {
+            if(calendar.get(Calendar.HOUR_OF_DAY) < 11) {
                 calendar.add(Calendar.DAY_OF_YEAR, -2);
             } else {
                 calendar.add(Calendar.DAY_OF_YEAR, -1);
             }
         }
 
+        String dateStr = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
         log.info("正在获取 {} 期排行榜数据...", calendar.getTime());
         for (PixivURL.RankingMode rankingMode : PixivURL.RankingMode.values()) {
             for (PixivURL.RankingContentType contentType : PixivURL.RankingContentType.values()) {
@@ -66,7 +68,7 @@ public class RankingUpdateTimer {
                 }
                 log.info("当前排行榜类型: {}.{}, 正在更新...", rankingMode.name(), contentType.name());
                 BotEventHandler.executeMessageEvent(new VirtualLoadMessageEvent(0,0,
-                                ".cgj ranking -type=" + contentType.name() + " -mode=" + rankingMode.name()));
+                                ".cgj ranking -type=" + contentType.name() + " -mode=" + rankingMode.name() + " -force -date " + dateStr));
                 log.info("排行榜 {}.{} 负载指令已投递.", rankingMode.name(), contentType.name());
             }
         }

src/main/java/net/lamgc/cgj/bot/SettingProperties.java

@@ -188,10 +188,10 @@ public final class SettingProperties {
         Objects.requireNonNull(key);
         Properties targetProperties;
         if(groupId <= 0) {
+            targetProperties = globalProp;
+        } else {
             changeList.add(groupId);
             targetProperties = getGroupProperties(groupId);
-        } else {
-            targetProperties = globalProp;
         }
         String lastValue = targetProperties.getProperty(key);
         if(value != null) {

src/main/java/net/lamgc/cgj/bot/cache/AutoCleanTimer.java

@@ -0,0 +1,52 @@
+package net.lamgc.cgj.bot.cache;
+
+import com.google.common.base.Throwables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+public class AutoCleanTimer extends TimerTask {
+
+    private final static Set<Cleanable> cleanSet = new CopyOnWriteArraySet<>();
+
+    private final static Timer cleanTimer = new Timer("Thread-AutoClean", true);
+
+    private final static Logger log = LoggerFactory.getLogger(AutoCleanTimer.class.getName());
+
+    static {
+        cleanTimer.schedule(new AutoCleanTimer(), 100L);
+    }
+
+    /**
+     * 增加需要定时执行清理的缓存库
+     * @param store 已实现Cleanable的对象
+     */
+    public static void add(Cleanable store) {
+        cleanSet.add(store);
+    }
+
+    /**
+     * 移除已添加的缓存库
+     * @param store 需要从AutoCleanTimer移除的对象
+     */
+    public static void remove(Cleanable store) {
+        cleanSet.remove(store);
+    }
+
+    private AutoCleanTimer() {}
+
+    @Override
+    public void run() {
+        cleanSet.forEach(cleanable -> {
+            try {
+                cleanable.clean();
+            } catch (Exception e) {
+                log.error("{} 执行清理动作时发生异常:\n{}", cleanable.toString(), Throwables.getStackTraceAsString(e));
+            }
+        });
+    }
+}

src/main/java/net/lamgc/cgj/bot/cache/Cleanable.java

@@ -0,0 +1,10 @@
+package net.lamgc.cgj.bot.cache;
+
+/**
+ * 可清理接口, 实现该接口代表该类拥有清理动作.
+ */
+public interface Cleanable {
+
+    void clean() throws Exception;
+
+}

src/main/java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java

@@ -10,7 +10,7 @@ import java.util.*;
  * @param <T> 存储类型
  * @author LamGC
  */
-public class HotDataCacheStore<T> implements CacheStore<T> {
+public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
 
     private final CacheStore<T> parent;
     private final CacheStore<T> current;
@@ -24,17 +24,22 @@ public class HotDataCacheStore<T> implements CacheStore<T> {
      * @param parent 上级缓存存储库
      * @param current 热点缓存存储库, 最好使用本地缓存(例如 {@linkplain LocalHashCacheStore LocalHashCacheStore})
      * @param expireTime 本地缓存库的缓存项过期时间, 单位毫秒;
-     *                   该时间并不是所有缓存项的最终过期时间, 还需要根据expireFloatRange的设定随机设置, 公式:
-     *                   {@code expireTime + new Random().nextInt(expireFloatRange)}
+ *                   该时间并不是所有缓存项的最终过期时间, 还需要根据expireFloatRange的设定随机设置, 公式:
+ *                   {@code expireTime + new Random().nextInt(expireFloatRange)}
      * @param expireFloatRange 过期时间的浮动范围(单位毫秒), 用于防止短时间内大量缓存项失效导致的缓存雪崩
+     * @param autoClean 是否交由{@link AutoCleanTimer}自动执行清理
      */
-    public HotDataCacheStore(CacheStore<T> parent, CacheStore<T> current, long expireTime, int expireFloatRange) {
+    public HotDataCacheStore(CacheStore<T> parent, CacheStore<T> current, long expireTime, int expireFloatRange, boolean autoClean) {
         this.parent = parent;
         this.current = current;
         this.expireTime = expireTime;
         this.expireFloatRange = expireFloatRange;
-        log.debug("HotDataCacheStore初始化完成. (Parent: {}, Current: {}, expireTime: {}, expireFloatRange: {})",
-                parent, current, expireTime, expireFloatRange);
+        if(autoClean) {
+            AutoCleanTimer.add(this);
+        }
+
+        log.debug("HotDataCacheStore初始化完成. (Parent: {}, Current: {}, expireTime: {}, expireFloatRange: {}, autoClean: {})",
+                parent, current, expireTime, expireFloatRange, autoClean);
     }
 
     @Override
@@ -121,4 +126,13 @@ public class HotDataCacheStore<T> implements CacheStore<T> {
     public boolean supportedList() {
         return false;
     }
+
+    @Override
+    public void clean() {
+        for(String key : this.current.keys()) {
+            if(current.exists(key)) {
+                current.remove(key);
+            }
+        }
+    }
 }

src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java

@@ -28,9 +28,9 @@ public class ImageCacheHandler implements EventHandler {
     private final static Set<ImageCacheObject> cacheQueue = Collections.synchronizedSet(new HashSet<>());
 
     @SuppressWarnings("unused")
-    public void getImageToCache(ImageCacheObject event) {
+    public void getImageToCache(ImageCacheObject event) throws Exception {
         if(cacheQueue.contains(event)) {
-            log.debug("图片 {} 已存在相同缓存任务, 跳过.", event.getStoreFile().getName());
+            log.warn("图片 {} 已存在相同缓存任务, 跳过.", event.getStoreFile().getName());
             return;
         } else {
             cacheQueue.add(event);
@@ -43,11 +43,11 @@ public class ImageCacheHandler implements EventHandler {
             try {
                 if(!storeFile.exists() && !storeFile.createNewFile()) {
                     log.error("无法创建文件(Path: {})", storeFile.getAbsolutePath());
-                    return;
+                    throw new IOException("Failed to create file");
                 }
             } catch (IOException e) {
                 log.error("无法创建文件(Path: {})", storeFile.getAbsolutePath());
-                e.printStackTrace();
+                throw e;
             }
 
             HttpGet request = new HttpGet(event.getDownloadLink());
@@ -57,11 +57,11 @@ public class ImageCacheHandler implements EventHandler {
                 response = httpClient.execute(request);
             } catch (IOException e) {
                 log.error("Http请求时发生异常", e);
-                return;
+                throw e;
             }
             if(response.getStatusLine().getStatusCode() != 200) {
                 log.warn("Http请求异常：{}", response.getStatusLine());
-                return;
+                throw new IOException("Http Response Error: " + response.getStatusLine());
             }
 
             log.debug("正在下载...(Content-Length: {}KB)", response.getEntity().getContentLength() / 1024);
@@ -69,7 +69,7 @@ public class ImageCacheHandler implements EventHandler {
                 IOUtils.copy(response.getEntity().getContent(), fos);
             } catch (IOException e) {
                 log.error("下载图片时发生异常", e);
-                return;
+                throw e;
             }
             event.getImageCache().put(URLs.getResourceName(event.getDownloadLink()), storeFile);
         } finally {

src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java

@@ -0,0 +1,109 @@
+package net.lamgc.cgj.bot.cache;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+public final class ImageCacheStore {
+
+    private final static Logger log = LoggerFactory.getLogger(ImageCacheStore.class.getName());
+
+    private final static Map<ImageCacheObject, Task> cacheMap = new Hashtable<>();
+
+    private final static ThreadPoolExecutor imageCacheExecutor = new ThreadPoolExecutor(
+            4, 6,
+            30L,
+            TimeUnit.SECONDS,
+            new LinkedBlockingQueue<>(100),
+            new ThreadFactoryBuilder()
+                    .setNameFormat("ImageCacheThread-%d")
+                    .build()
+    );
+
+    private final static ImageCacheHandler handler = new ImageCacheHandler();
+
+    private ImageCacheStore() {}
+
+    /**
+     * 传递图片缓存任务, 并等待缓存完成.
+     * @param cacheObject 缓存任务组
+     */
+    public static void executeCacheRequest(ImageCacheObject cacheObject) throws InterruptedException {
+        Task task = getTaskState(cacheObject);
+        if(task.taskState.get() == TaskState.COMPLETE) {
+            return;
+        }
+
+        boolean locked = false;
+        try {
+            if(task.taskState.get() == TaskState.COMPLETE) {
+                return;
+            }
+            task.lock.lock();
+            locked = true;
+            // 双重检查
+            if(task.taskState.get() == TaskState.COMPLETE) {
+                return;
+            }
+
+            // 置任务状态
+            task.taskState.set(TaskState.RUNNING);
+
+            try {
+                Throwable throwable = imageCacheExecutor.submit(() -> {
+                    try {
+                        handler.getImageToCache(cacheObject);
+                    } catch (Throwable e) {
+                        return e;
+                    }
+                    return null;
+                }).get();
+
+                if(throwable == null) {
+                    task.taskState.set(TaskState.COMPLETE);
+                } else {
+                    task.taskState.set(TaskState.ERROR);
+                }
+            } catch (ExecutionException e) {
+                log.error("执行图片缓存任务时发生异常", e);
+            }
+        } finally {
+            if(locked) {
+                task.lock.unlock();
+            }
+        }
+
+    }
+
+    private static Task getTaskState(ImageCacheObject cacheObject) {
+        if(!cacheMap.containsKey(cacheObject)) {
+            cacheMap.put(cacheObject, new Task());
+        }
+        return cacheMap.get(cacheObject);
+    }
+
+    /**
+     * 任务状态
+     */
+    private enum TaskState {
+        READY, RUNNING, COMPLETE, ERROR
+    }
+
+    private static class Task {
+
+        public final ReentrantLock lock = new ReentrantLock(true);
+
+        public final AtomicReference<TaskState> taskState = new AtomicReference<>(TaskState.READY);
+
+        public final Condition condition = lock.newCondition();
+
+    }
+
+}

src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java

@@ -13,7 +13,7 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-public abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
+abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
 
     private final JedisPool jedisPool;
     private final String keyPrefix;

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

@@ -41,6 +41,8 @@ public class BotEventHandler implements EventHandler {
 
     private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class.getName());
 
+    private final static Map<Long, AtomicBoolean> muteStateMap = new Hashtable<>();
+
     /**
      * 所有缓存共用的JedisPool
      */
@@ -158,6 +160,9 @@ public class BotEventHandler implements EventHandler {
         log.debug(event.toString());
         if(!match(msg)) {
             return;
+        } else if(isMute(event.getFromGroup())) {
+            log.debug("机器人已被禁言, 忽略请求.");
+            return;
         }
 
         Pattern pattern = Pattern.compile("/\\s*(\".+?\"|[^:\\s])+((\\s*:\\s*(\".+?\"|[^\\s])+)|)|(\".+?\"|[^\"\\s])+");
@@ -219,12 +224,14 @@ public class BotEventHandler implements EventHandler {
             }
         }
         long processTime = System.currentTimeMillis() - time;
-        if(Objects.requireNonNull(result) instanceof String) {
+        if(Objects.requireNonNull(result) instanceof String && !isMute(event.getFromGroup())) {
             try {
                 event.sendMessage((String) result);
             } catch (Exception e) {
                 log.error("发送消息时发生异常", e);
             }
+        } else if(isMute(event.getFromGroup())) {
+            log.warn("命令反馈时机器人已被禁言, 跳过反馈.");
         }
         long totalTime = System.currentTimeMillis() - time;
         log.info("命令反馈完成.(事件耗时: {}ms, P: {}%({}ms), R: {}%({}ms))", totalTime,
@@ -241,4 +248,40 @@ public class BotEventHandler implements EventHandler {
         return message.startsWith(COMMAND_PREFIX) || message.startsWith(ADMIN_COMMAND_PREFIX);
     }
 
+    private static boolean isMute(long groupId) {
+        Boolean mute = isMute(groupId, false);
+        return mute != null && mute;
+    }
+
+    /**
+     * 查询某群是否被禁言.
+     * @param groupId 群组Id
+     * @param rawValue 是否返回原始值(当没有该群状态, 且本参数为true时, 将返回null)
+     * @return 返回状态值, 如无该群禁言记录且rawValue = true, 则返回null
+     */
+    public static Boolean isMute(long groupId, boolean rawValue) {
+        if(groupId <= 0) {
+            return false;
+        }
+        AtomicBoolean state = muteStateMap.get(groupId);
+        if(state == null && rawValue) {
+            return null;
+        }
+        return state != null && state.get();
+    }
+
+    /**
+     * 设置机器人禁言状态.
+     * <p>设置该项可防止因机器人在禁言期间反馈请求导致被封号.</p>
+     * @param mute 如果被禁言, 传入true
+     */
+    public static void setMuteState(long groupId, boolean mute) {
+        if(!muteStateMap.containsKey(groupId)) {
+            muteStateMap.put(groupId, new AtomicBoolean(mute));
+        } else {
+            muteStateMap.get(groupId).set(mute);
+        }
+        log.warn("群组 {} 机器人禁言状态已变更: {}", groupId, mute ? "已禁言" : "已解除");
+    }
+
 }

src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java

@@ -6,7 +6,10 @@ import net.lamgc.cgj.bot.message.MessageSenderBuilder;
 import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageSenderFactory;
 import net.mamoe.mirai.Bot;
 import net.mamoe.mirai.BotFactoryJvm;
+import net.mamoe.mirai.event.events.BotMuteEvent;
+import net.mamoe.mirai.event.events.BotUnmuteEvent;
 import net.mamoe.mirai.japt.Events;
+import net.mamoe.mirai.message.ContactMessage;
 import net.mamoe.mirai.message.FriendMessage;
 import net.mamoe.mirai.message.GroupMessage;
 import net.mamoe.mirai.utils.BotConfiguration;
@@ -43,14 +46,33 @@ public class MiraiMain implements Closeable {
         }
 
         bot = BotFactoryJvm.newBot(Long.parseLong(botProperties.getProperty("bot.qq", "0")), Base64.decodeBase64(botProperties.getProperty("bot.password", "")), new BotConfiguration());
-        Events.subscribeAlways(GroupMessage.class, (msg) -> BotEventHandler.executeMessageEvent(new MiraiMessageEvent(msg)));
-        Events.subscribeAlways(FriendMessage.class, (msg) -> BotEventHandler.executeMessageEvent(new MiraiMessageEvent(msg)));
+        Events.subscribeAlways(GroupMessage.class, this::executeMessageEvent);
+        Events.subscribeAlways(FriendMessage.class, this::executeMessageEvent);
+        Events.subscribeAlways(BotMuteEvent.class,
+                event -> BotEventHandler.setMuteState(event.getGroup().getId(), true));
+        Events.subscribeAlways(BotUnmuteEvent.class,
+                event -> BotEventHandler.setMuteState(event.getGroup().getId(), false));
         bot.login();
         MessageSenderBuilder.setCurrentMessageSenderFactory(new MiraiMessageSenderFactory(bot));
         BotEventHandler.preLoad();
         bot.join();
     }
 
+    /**
+     * 处理消息事件
+     * @param message 消息事件对象
+     */
+    private void executeMessageEvent(ContactMessage message) {
+        if(message instanceof GroupMessage) {
+            GroupMessage groupMessage = (GroupMessage) message;
+            if(BotEventHandler.isMute(groupMessage.getGroup().getId(), true) == null) {
+                BotEventHandler.setMuteState(groupMessage.getGroup().getId(),
+                        ((GroupMessage) message).getGroup().getBotMuteRemaining() != 0);
+            }
+        }
+        BotEventHandler.executeMessageEvent(new MiraiMessageEvent(message));
+    }
+
     public void close() {
         log.warn("正在关闭机器人...");
         bot.close(null);

src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java

@@ -16,7 +16,7 @@ public class MiraiMessageEvent extends MessageEvent {
 
     public MiraiMessageEvent(ContactMessage message) {
         super(message instanceof GroupMessage ? ((GroupMessage) message).getGroup().getId() : 0,
-                message.getSender().getId(), message.getMessage().contentToString());
+                message.getSender().getId(), getMessageBodyWithoutSource(message.getMessage().toString()));
         this.messageObject = Objects.requireNonNull(message);
         if(message instanceof GroupMessage) {
             messageSender = new MiraiMessageSender(((GroupMessage) message).getGroup(), MessageSource.Group);
@@ -26,6 +26,19 @@ public class MiraiMessageEvent extends MessageEvent {
 
     }
 
+    /**
+     * 将ContactMessage获得的消息内容删除 Mirai:source 并返回.
+     * <p>该做法比较保守, 防止Mirai:source位置出现变动.</p>
+     * @param message ContactMessage的消息内容;
+     * @return 返回删除了Mirai:source的消息
+     */
+    private static String getMessageBodyWithoutSource(String message) {
+        StringBuilder builder = new StringBuilder(message);
+        int startIndex = builder.indexOf("[mirai:source:");
+        int endIndex = builder.indexOf("]", startIndex) + 1;
+        return builder.delete(startIndex, endIndex).toString();
+    }
+
     @Override
     public int sendMessage(final String message) {
         return messageSender.sendMessage(message);

src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java

@@ -33,7 +33,7 @@ public class MiraiMessageSender implements MessageSender {
     private final static CacheStore<String> imageIdCache = new HotDataCacheStore<>(
             new StringRedisCacheStore(BotEventHandler.redisServer, "mirai.imageId"),
             new LocalHashCacheStore<>(),
-            5400000, 1800000);
+            5400000, 1800000, true);
 
     /**
      * 使用id构造发送器