From 66b22c543ade6f36ff223206348b0171f1093c1f Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Sat, 9 May 2020 22:54:32 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=20SettingProperties=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA,=20=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=85=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?;=20[Fix]=20Main=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=BD=9C?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E6=96=87=E4=BB=B6=E5=88=9B=E5=BB=BA=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/lamgc/cgj/Main.java                  | 2 +-
 src/main/java/net/lamgc/cgj/bot/SettingProperties.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java
index a1487b6..db914fa 100644
--- a/src/main/java/net/lamgc/cgj/Main.java
+++ b/src/main/java/net/lamgc/cgj/Main.java
@@ -398,7 +398,7 @@ public class Main {
     private static void saveCookieStoreToFile() throws IOException {
         log.info("正在保存CookieStore...");
         File outputFile = new File(System.getProperty("cgj.botDataDir"), "cookies.store");
-        if(!outputFile.exists() && !outputFile.delete() && !outputFile.createNewFile()){
+        if(!outputFile.exists() && !outputFile.createNewFile()){
             log.error("保存CookieStore失败.");
             return;
         }
diff --git a/src/main/java/net/lamgc/cgj/bot/SettingProperties.java b/src/main/java/net/lamgc/cgj/bot/SettingProperties.java
index d5d4ab3..945299b 100644
--- a/src/main/java/net/lamgc/cgj/bot/SettingProperties.java
+++ b/src/main/java/net/lamgc/cgj/bot/SettingProperties.java
@@ -10,7 +10,7 @@ import java.util.*;
 
 public final class SettingProperties {
 
-    private final static Logger log = LoggerFactory.getLogger("SettingProperties");
+    private final static Logger log = LoggerFactory.getLogger(SettingProperties.class.getName());
 
     private final static File globalPropFile = new File(getPropertiesDir(), "global.properties");
     private final static Properties globalProp = new Properties();
@@ -95,7 +95,7 @@ public final class SettingProperties {
 
     private static void saveGroupProperties(Long groupId, Properties properties) throws IOException {
         File groupPropFile = new File(getPropertiesDir(), "group." + groupId + ".properties");
-        if((!groupPropFile.exists() || !groupPropFile.isFile()) && (!groupPropFile.delete() || !groupPropFile.createNewFile())) {
+        if(!groupPropFile.exists() && !groupPropFile.createNewFile()) {
             log.error("群组 {} 配置文件创建失败!", groupId);
             return;
         }
@@ -122,7 +122,7 @@ public final class SettingProperties {
      */
     private static void saveGlobalProperties() {
         try {
-            if((!globalPropFile.exists() || !globalPropFile.isFile()) && (!globalPropFile.delete() || !globalPropFile.createNewFile())) {
+            if(!globalPropFile.exists() && !globalPropFile.createNewFile()) {
                 log.error("创建全局配置文件失败.");
                 return;
             }
@@ -158,7 +158,7 @@ public final class SettingProperties {
      */
     private static File getPropertiesDir() {
         File propDir = new File(System.getProperty("cgj.botDataDir"), "/setting/");
-        if((!propDir.exists() || !propDir.isDirectory()) && (!propDir.delete() || !propDir.mkdirs())) {
+        if(!propDir.exists() && !propDir.mkdirs()) {
             log.warn("Setting文件夹创建失败!");
         }
         return propDir;