From 6789b5b7c5fedb82aba557d8a45949b4beaab72e Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Mon, 8 Jun 2020 19:13:51 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20CacheStoreCentral=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4'getImageById'=E6=96=B9=E6=B3=95=E4=B8=AD=E5=AF=B9'pag?=
 =?UTF-8?q?eIndex'=E7=9A=84=E5=8F=82=E6=95=B0=E5=80=BC=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=97=B6=E6=9C=BA;=20[Change]=20MiraiMessageSender=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AD=A6=E5=91=8A=E5=BF=BD=E7=95=A5=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java     | 6 +++++-
 .../cgj/bot/framework/mirai/message/MiraiMessageSender.java | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java b/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java
index 5a903a9..09fa4c7 100644
--- a/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java
+++ b/src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java
@@ -98,6 +98,10 @@ public final class CacheStoreCentral {
      */
     public static String getImageById(long fromGroup, int illustId, PixivDownload.PageQuality quality, int pageIndex) {
         log.debug("IllustId: {}, Quality: {}, PageIndex: {}", illustId, quality.name(), pageIndex);
+        if(pageIndex <= 0) {
+            log.warn("指定的页数不能小于或等于0: {}", pageIndex);
+            return "指定的页数不能小于或等于0！";
+        }
 
         try {
             if (BotCommandProcess.isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
@@ -128,7 +132,7 @@ public final class CacheStoreCentral {
             log.debug(logBuilder.toString());
         }
 
-        if (pagesList.size() < pageIndex || pageIndex <= 0) {
+        if (pagesList.size() < pageIndex) {
             log.warn("指定的页数超出了总页数({} / {})", pageIndex, pagesList.size());
             return "指定的页数超出了范围(总共 " + pagesList.size() + " 页)";
         }
diff --git 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
index 46a5273..c58a298 100644
--- 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
@@ -134,6 +134,7 @@ public class MiraiMessageSender implements MessageSender {
      * @param code 图片BotCode
      * @return Image对象
      */
+    @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
     public Image uploadImage(BotCode code) {
         log.debug("传入BotCode信息:\n{}", code);
         String absolutePath = code.getParameter("absolutePath");