diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java index db914fa..582f35a 100644 --- a/src/main/java/net/lamgc/cgj/Main.java +++ b/src/main/java/net/lamgc/cgj/Main.java @@ -86,13 +86,15 @@ public class Main { File cookieStoreFile = new File(System.getProperty("cgj.botDataDir"), "cookies.store"); if(!cookieStoreFile.exists()) { log.warn("未找到cookies.store文件, 是否启动PixivLoginProxyServer? (yes/no)"); - Scanner scanner = new Scanner(System.in); - if(scanner.nextLine().trim().equalsIgnoreCase("yes")) { - startPixivLoginProxyServer(); - } else { - System.exit(1); - return; + try(Scanner scanner = new Scanner(System.in)) { + if(scanner.nextLine().trim().equalsIgnoreCase("yes")) { + startPixivLoginProxyServer(); + } else { + System.exit(1); + return; + } } + } ObjectInputStream ois = new ObjectInputStream(new FileInputStream(cookieStoreFile)); cookieStore = (CookieStore) ois.readObject(); @@ -137,7 +139,9 @@ public class Main { @Command public static void botMode(@Argument(name = "args", force = false) String argsStr) { - new MiraiMain().init(); + MiraiMain main = new MiraiMain(); + main.init(); + main.close(); } @Command @@ -423,23 +427,25 @@ public class Main { proxyServerStartThread.setName("LoginProxyServerThread"); proxyServerStartThread.start(); //System.console().readLine(); - Scanner scanner = new Scanner(System.in); + log.info("登录完成后, 使用\"done\"命令结束登录过程."); - 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); + 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\"命令."); } - break; - } else { - log.warn("要结束登录过程, 请使用\"done\"命令."); } } } diff --git a/src/main/java/net/lamgc/cgj/bot/AutoArtworksSender.java b/src/main/java/net/lamgc/cgj/bot/AutoArtworksSender.java deleted file mode 100644 index aff1d4e..0000000 --- a/src/main/java/net/lamgc/cgj/bot/AutoArtworksSender.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.lamgc.cgj.bot; - -import net.lz1998.cq.robot.CoolQ; -import org.apache.http.client.methods.HttpGet; - -import java.util.Random; -import java.util.Timer; -import java.util.TimerTask; - -public class AutoArtworksSender { - - private final CoolQ CQ; - private final ReceiveType receiveType; - private final long targetReceiveId; - private Timer timer = new Timer(); - private TimerTask task = new TimerTask() { - @Override - public void run() { - HttpGet request = new HttpGet(); - - // https://api.imjad.cn/pixiv/v2/?type=tags - } - }; - - public AutoArtworksSender(CoolQ cq, ReceiveType receiveType, long receiveId) { - this.CQ = cq; - this.receiveType = receiveType; - this.targetReceiveId = receiveId; - } - - public void reset(long time) { - if(time <= 0) { - timer.schedule(task, new Random().nextInt(10 * 60 * 60 * 1000) + 7200000L); //2H ~ 12H - } else { - timer.schedule(task, time); - } - } - - public void sendMessage(String message, boolean auto_escape) { - switch (receiveType) { - case GROUP: - CQ.sendGroupMsg(targetReceiveId, message, auto_escape); - break; - case Discuss: - CQ.sendDiscussMsg(targetReceiveId, message, auto_escape); - break; - case PRIVATE: - CQ.sendPrivateMsg(targetReceiveId, message, auto_escape); - break; - } - } - - public enum ReceiveType { - PRIVATE, GROUP, Discuss - } - -} diff --git a/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java b/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java index 977369b..11b1f25 100644 --- a/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java +++ b/src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java @@ -8,7 +8,6 @@ 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 { @@ -102,8 +101,6 @@ public final class ImageCacheStore { public final AtomicReference taskState = new AtomicReference<>(TaskState.READY); - public final Condition condition = lock.newCondition(); - } } diff --git a/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java b/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java index 9c8646c..535e640 100644 --- a/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java +++ b/src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java @@ -99,7 +99,7 @@ public class PixivAccessProxyServer { }*/ log.info("Response Cookie: " + value); BasicClientCookie cookie = parseRawCookie(value); - cookieStore.addCookie(null); + cookieStore.addCookie(cookie); }); httpResponse.headers().remove(HttpHeaderNames.SET_COOKIE); super.afterResponse(clientChannel, proxyChannel, httpResponse, pipeline); diff --git a/src/main/java/net/lamgc/cgj/util/PagesQualityParser.java b/src/main/java/net/lamgc/cgj/util/PagesQualityParser.java index c25b41c..478255f 100644 --- a/src/main/java/net/lamgc/cgj/util/PagesQualityParser.java +++ b/src/main/java/net/lamgc/cgj/util/PagesQualityParser.java @@ -1,7 +1,6 @@ package net.lamgc.cgj.util; import net.lamgc.cgj.pixiv.PixivDownload; -import net.lamgc.cgj.pixiv.PixivURL; import net.lamgc.utils.base.runner.StringParameterParser; public class PagesQualityParser implements StringParameterParser {