diff --git a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java index 337e2b6..1e91ed5 100644 --- a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java +++ b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java @@ -133,6 +133,7 @@ public class RandomIntervalSendTimer extends TimerTask { @Override public boolean cancel() { start.set(false); + loop.set(false); return super.cancel(); } diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java index 5f158d0..4ee9a19 100644 --- a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java +++ b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java @@ -317,6 +317,7 @@ public class PixivDownload { ArrayList results = new ArrayList<>(range); for (int pageIndex = startPages; pageIndex <= endPages && count < range; pageIndex++) { HttpGet request = createHttpGetRequest(PixivURL.getRankingLink(contentType, mode, time, pageIndex, true)); + log.debug("RequestUri: {}", request.getURI()); HttpResponse response = httpClient.execute(request); if(response.getStatusLine().getStatusCode() != 200) { diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java b/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java index c61be83..43ed259 100644 --- a/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java +++ b/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java @@ -186,7 +186,7 @@ public class PixivURL { public static String getRankingLink(RankingContentType contentType, RankingMode mode, Date time, int pageIndex, boolean json){ StringBuilder linkBuilder = new StringBuilder(PIXIV_RANKING_LINK); linkBuilder.append("mode=").append(mode == null ? RankingMode.MODE_DAILY.modeParam : mode.modeParam); - if(contentType != null && !contentType.equals(RankingContentType.ALL)){ + if(contentType != null && !contentType.equals(RankingContentType.TYPE_ALL)){ linkBuilder.append("&content=").append(contentType.typeName); } SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); @@ -278,7 +278,7 @@ public class PixivURL { * 排名榜类型 */ public enum RankingContentType{ - ALL("", RankingMode.values()), + TYPE_ALL("", RankingMode.values()), /** * 插画 * 支持的时间类型: 每天, 每周, 每月, 新人