From 572189d906fcebd169e3b1e4f720bfae9ff8f984 Mon Sep 17 00:00:00 2001 From: LamGC Date: Tue, 23 Jun 2020 10:02:47 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20Main=20=E5=A2=9E=E5=8A=A0'buildPassw?= =?UTF-8?q?ord'=E5=91=BD=E4=BB=A4=E7=94=A8=E4=BA=8E=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E5=90=8E=E7=9A=84=E5=AF=86=E7=A0=81,=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=AF=B9PixivLoginProxyServer=E7=9A=84?= =?UTF-8?q?=E5=B5=8C=E5=85=A5=E6=94=AF=E6=8C=81;=20[Delete]=20pom.xml=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BE=9D=E8=B5=96=E9=A1=B9'net.lamgc:PixivLo?= =?UTF-8?q?ginProxyServer';?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 ---- src/main/java/net/lamgc/cgj/Main.java | 83 ++++++--------------------- 2 files changed, 19 insertions(+), 75 deletions(-) diff --git a/pom.xml b/pom.xml index 41f7136..45a3b80 100644 --- a/pom.xml +++ b/pom.xml @@ -162,17 +162,6 @@ ktor-server-core ${ktor.version} - - net.lamgc - PixivLoginProxyServer - 1.1.1 - - - org.slf4j - slf4j-log4j12 - - - com.squareup gifencoder diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java index d73380f..8aee025 100644 --- 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; @@ -15,10 +13,10 @@ import net.lamgc.cgj.bot.framework.mirai.MiraiMain; import net.lamgc.cgj.pixiv.PixivDownload; 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(); @@ -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("创建文件夹失败!");