[Version] 更新版本(2.5.2-20200604.1-SNAPSHOT -> 2.5.2-20200604.2-SNAPSHOT);

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.lamgc</groupId>
     <artifactId>ContentGrabbingJi</artifactId>
-    <version>2.5.2-20200604.1-SNAPSHOT</version>
+    <version>2.5.2-20200604.2-SNAPSHOT</version>
 
     <repositories>
         <repository>

src/main/java/net/lamgc/cgj/Main.java

@@ -15,9 +15,7 @@ import net.lamgc.cgj.bot.framework.mirai.MiraiMain;
 import net.lamgc.cgj.pixiv.PixivDownload;
 import net.lamgc.cgj.pixiv.PixivSearchBuilder;
 import net.lamgc.cgj.pixiv.PixivURL;
-import net.lamgc.cgj.util.PropertiesUtils;
 import net.lamgc.plps.PixivLoginProxyServer;
-import net.lamgc.utils.base.ArgumentsProperties;
 import net.lamgc.utils.base.runner.Argument;
 import net.lamgc.utils.base.runner.ArgumentsRunner;
 import net.lamgc.utils.base.runner.Command;
@@ -33,7 +31,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 import java.io.*;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -46,13 +43,13 @@ import java.util.zip.ZipOutputStream;
 @SpringBootApplication
 public class Main {
 
-    private final static Logger log = LoggerFactory.getLogger(Main.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(Main.class);
 
     private final static File storeDir = new File("store/");
 
-    public static CookieStore cookieStore;
+    private static CookieStore cookieStore;
 
-    public static HttpHost proxy;
+    private static HttpHost proxy;
 
     public static void main(String[] args) throws IOException, ClassNotFoundException {
         log.trace("ContentGrabbingJi 正在启动...");
@@ -61,21 +58,8 @@ public class Main {
 
         ApplicationBoot.initialApplication(args);
         log.debug("botDataDir: {}", System.getProperty("cgj.botDataDir"));
-        ArgumentsProperties argsProp = new ArgumentsProperties(args);
-
-        if(!PropertiesUtils.getSettingToSysProp(argsProp, "proxy", null)) {
-            PropertiesUtils.getEnvSettingToSysProp("CGJ_PROXY", "proxy", null);
-        }
-
-        String proxyAddress = System.getProperty("cgj.proxy");
-        if(!Strings.isNullOrEmpty(proxyAddress)) {
-            URL proxyUrl = new URL(proxyAddress);
-            proxy = new HttpHost(proxyUrl.getHost(), proxyUrl.getPort());
-            log.info("已启用Http协议代理：{}", proxy.toHostString());
-        } else {
-            proxy = null;
-        }
 
+        proxy = BotGlobal.getGlobal().getProxy();
         File cookieStoreFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "cookies.store");
         if(!cookieStoreFile.exists()) {
             log.warn("未找到cookies.store文件, 是否启动PixivLoginProxyServer? (yes/no)");
@@ -91,6 +75,7 @@ public class Main {
         }
         ObjectInputStream ois = new ObjectInputStream(new FileInputStream(cookieStoreFile));
         cookieStore = (CookieStore) ois.readObject();
+        BotGlobal.getGlobal().setCookieStore(cookieStore);
         ois.close();
         log.info("已载入CookieStore");
 

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

@@ -21,7 +21,7 @@ import java.util.*;
 
 public class BotAdminCommandProcess {
 
-    private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(BotAdminCommandProcess.class);
 
     private final static File pushListFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "pushList.json");
 

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

@@ -4,7 +4,6 @@ import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
 import com.google.gson.*;
 import io.netty.handler.codec.http.HttpHeaderNames;
-import net.lamgc.cgj.Main;
 import net.lamgc.cgj.bot.boot.BotGlobal;
 import net.lamgc.cgj.bot.cache.*;
 import net.lamgc.cgj.bot.event.BufferMessageEvent;
@@ -37,9 +36,10 @@ import java.util.concurrent.atomic.AtomicInteger;
 @SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter", "SameParameterValue"})
 public class BotCommandProcess {
 
-    private final static PixivDownload pixivDownload = new PixivDownload(Main.cookieStore, Main.proxy);
+    private final static PixivDownload pixivDownload =
+            new PixivDownload(BotGlobal.getGlobal().getCookieStore(), BotGlobal.getGlobal().getProxy());
 
-    private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class);
 
     private final static File imageStoreDir = new File(BotGlobal.getGlobal().getDataStoreDir(), "data/image/cgj/");
     private final static Gson gson = new GsonBuilder()

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

@@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public class RandomIntervalSendTimer extends TimerTask {
 
     private final static Timer timer = new Timer("Thread-RIST", true);
-    private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class);
     private final static Map<Long, RandomIntervalSendTimer> timerMap = new HashMap<>();
 
     private final long timerId;
@@ -22,7 +22,7 @@ public class RandomIntervalSendTimer extends TimerTask {
     private final AutoSender sender;
     private final long time;
     private final int floatTime;
-    private AtomicBoolean loop = new AtomicBoolean();
+    private final AtomicBoolean loop = new AtomicBoolean();
     private final AtomicBoolean start = new AtomicBoolean();
     private final String hashId = Integer.toHexString(this.hashCode());
 

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

@@ -11,7 +11,7 @@ import java.util.*;
 
 public final class SettingProperties {
 
-    private final static Logger log = LoggerFactory.getLogger(SettingProperties.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(SettingProperties.class);
 
     private final static File globalPropFile = new File(getPropertiesDir(), "global.properties");
     private final static Properties globalProp = new Properties();

src/main/java/net/lamgc/cgj/bot/boot/ApplicationBoot.java

@@ -18,6 +18,9 @@ public final class ApplicationBoot {
      */
     public static void initialApplication(String[] args) {
         ArgumentsProperties argsProp = new ArgumentsProperties(args);
+        if(!PropertiesUtils.getSettingToSysProp(argsProp, "proxy", null)) {
+            PropertiesUtils.getEnvSettingToSysProp("CGJ_PROXY", "proxy", null);
+        }
         if(!PropertiesUtils.getSettingToSysProp(argsProp, "botDataDir", "./") &&
                 !PropertiesUtils.getEnvSettingToSysProp("CGJ_BOT_DATA_DIR", "botDataDir", "./")) {
             log.warn("未设置botDataDir, 当前运行目录将作为酷Q机器人所在目录.");

src/main/java/net/lamgc/cgj/bot/boot/BotGlobal.java

@@ -1,11 +1,16 @@
 package net.lamgc.cgj.bot.boot;
 
+import com.google.common.base.Strings;
+import org.apache.http.HttpHost;
+import org.apache.http.client.CookieStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import redis.clients.jedis.JedisPool;
 
 import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URL;
 
 public final class BotGlobal {
 
@@ -29,6 +34,10 @@ public final class BotGlobal {
 
     private final File dataStoreDir;
 
+    private final HttpHost proxy;
+
+    private CookieStore cookieStore;
+
     private BotGlobal() {
         this.redisUri = URI.create("redis://" + System.getProperty("cgj.redisAddress"));
         this.redisServer = new JedisPool(
@@ -37,6 +46,19 @@ public final class BotGlobal {
         String dataStoreDirPath = System.getProperty("cgj.botDataDir");
         this.dataStoreDir = new File((!dataStoreDirPath.endsWith("/") || !dataStoreDirPath.endsWith("\\")) ?
                 dataStoreDirPath + System.getProperty("file.separator") : dataStoreDirPath);
+
+        String proxyAddress = System.getProperty("cgj.proxy");
+        HttpHost temp = null;
+        if(!Strings.isNullOrEmpty(proxyAddress)) {
+            try {
+                URL proxyUrl = new URL(proxyAddress);
+                temp = new HttpHost(proxyUrl.getHost(), proxyUrl.getPort());
+                log.info("已启用Http协议代理：{}", temp.toHostString());
+            } catch (MalformedURLException e) {
+                log.error("Proxy地址解析失败, 代理将不会启用.", e);
+            }
+        }
+        this.proxy = temp;
     }
 
     public URI getRedisUri() {
@@ -53,4 +75,17 @@ public final class BotGlobal {
     public JedisPool getRedisServer() {
         return redisServer;
     }
+
+    public HttpHost getProxy() {
+        return proxy;
+    }
+
+
+    public CookieStore getCookieStore() {
+        return cookieStore;
+    }
+
+    public void setCookieStore(CookieStore cookieStore) {
+        this.cookieStore = cookieStore;
+    }
 }

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

@@ -1,6 +1,6 @@
 package net.lamgc.cgj.bot.cache;
 
-import net.lamgc.cgj.Main;
+import net.lamgc.cgj.bot.boot.BotGlobal;
 import net.lamgc.cgj.bot.cache.exception.HttpRequestException;
 import net.lamgc.cgj.pixiv.PixivURL;
 import net.lamgc.cgj.util.URLs;
@@ -22,9 +22,11 @@ import java.util.Set;
 
 public class ImageCacheHandler implements EventHandler {
 
-    private final static Logger log = LoggerFactory.getLogger(ImageCacheHandler.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(ImageCacheHandler.class);
 
-    private final static HttpClient httpClient = HttpClientBuilder.create().setProxy(Main.proxy).build();
+    private final static HttpClient httpClient = HttpClientBuilder.create()
+            .setProxy(BotGlobal.getGlobal().getProxy())
+            .build();
 
     private final static Set<ImageCacheObject> cacheQueue = Collections.synchronizedSet(new HashSet<>());
 

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

@@ -17,7 +17,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 public final class ImageCacheStore {
 
-    private final static Logger log = LoggerFactory.getLogger(ImageCacheStore.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(ImageCacheStore.class);
 
     private final static Map<ImageCacheObject, Task> cacheMap = new Hashtable<>();
 

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

@@ -38,7 +38,7 @@ public class BotEventHandler implements EventHandler {
     private final ArgumentsRunner processRunner;
     private final ArgumentsRunner adminRunner;
 
-    private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(BotEventHandler.class);
 
     private final static Map<Long, AtomicBoolean> muteStateMap = new Hashtable<>();
 

src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java

@@ -20,7 +20,7 @@ public class CQPluginMain extends CQPlugin implements EventHandler {
         // TODO(LamGC, 2020.04.21): SpringCQ无法适配MessageSenderBuilder
         // MessageSenderBuilder.setCurrentMessageSenderFactory(new SpringCQMessageSenderFactory());
         ApplicationBoot.initialBot();
-        LoggerFactory.getLogger(CQPluginMain.class.getName())
+        LoggerFactory.getLogger(CQPluginMain.class)
                 .info("BotEventHandler.COMMAND_PREFIX = {}", BotEventHandler.COMMAND_PREFIX);
     }
 

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

@@ -22,7 +22,7 @@ import java.util.Properties;
 
 public class MiraiMain implements Closeable {
 
-    private final Logger log = LoggerFactory.getLogger(MiraiMain.class.getName());
+    private final Logger log = LoggerFactory.getLogger(MiraiMain.class);
 
     private Bot bot;
 

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

@@ -26,7 +26,7 @@ public class MiraiMessageSender implements MessageSender {
 
     private final Contact member;
     private final MessageSource source;
-    private final static Logger log = LoggerFactory.getLogger(MiraiMessageSender.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(MiraiMessageSender.class);
     private final static CacheStore<String> imageIdCache = new HotDataCacheStore<>(
             new StringRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "mirai.imageId"),
             new LocalHashCacheStore<>(),

src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java

@@ -33,7 +33,7 @@ import java.util.function.BiConsumer;
 
 public class PixivDownload {
 
-    private final static Logger log = LoggerFactory.getLogger(PixivDownload.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(PixivDownload.class);
 
     private final HttpClient httpClient;
 

src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 public class PixivAccessProxyServer {
 
-    private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class.getName());
+    private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class);
 
     private final HttpProxyServer proxyServer;
 

src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java

@@ -31,9 +31,9 @@ public class PixivDownloadTest {
 
     private static CookieStore cookieStore;
 
-    private final static Logger log = LoggerFactory.getLogger(PixivDownloadTest.class.getName());
+    private final static Logger log = LoggerFactory.getLogger(PixivDownloadTest.class);
 
-    private static HttpHost proxy = new HttpHost("127.0.0.1", 1001);
+    private static final HttpHost proxy = new HttpHost("127.0.0.1", 1001);
     
     @BeforeClass
     public static void before() throws IOException, ClassNotFoundException {