Merge branch 'master' into add-MultiProperties

This commit is contained in:
2020-05-06 10:18:00 +08:00
18 changed files with 19 additions and 22 deletions

View File

@ -39,7 +39,7 @@ public class BotCommandProcess {
private final static PixivDownload pixivDownload = new PixivDownload(Main.cookieStore, Main.proxy);
private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class.getSimpleName());
private final static Logger log = LoggerFactory.getLogger(BotCommandProcess.class.getName());
private final static File imageStoreDir = new File(System.getProperty("cgj.botDataDir"), "data/image/cgj/");
private final static Gson gson = new GsonBuilder()