From 40c5284be24fb8512cda4ce7acef277dd96f086f Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Mon, 4 May 2020 17:07:39 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20Dockerfile.sample=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=9E=84=E5=BB=BA=E6=8C=87=E4=BB=A4=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=BB=A5=E5=85=85=E5=88=86=E5=88=A9=E7=94=A8=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98;=20[Fix]=20Main=20=E4=BF=AE=E5=A4=8DSystemPr?=
 =?UTF-8?q?operties=E8=AE=BE=E7=BD=AEnull=E6=8A=9B=E5=87=BANPE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile.sample                     | 3 ++-
 src/main/java/net/lamgc/cgj/Main.java | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.sample b/Dockerfile.sample
index 4aabdc4..46b9e84 100644
--- a/Dockerfile.sample
+++ b/Dockerfile.sample
@@ -3,7 +3,8 @@ FROM openjdk:8u252-jre
 ENV jarFileName=ContentGrabbingJi-exec.jar
 ENV CGJ_REDIS_URI="127.0.0.1:6379"
 ENV CGJ_PROXY=""
-COPY ${jarFileName} /CGJ.jar
 RUN mkdir /data/
 
+COPY ${jarFileName} /CGJ.jar
+
 CMD ["java", "-Dcgj.logsPath=/data/logs", "-jar", "/CGJ.jar", "botMode", "-botDataDir=/data"]
\ No newline at end of file
diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java
index 5b76fb6..b2d91b8 100644
--- a/src/main/java/net/lamgc/cgj/Main.java
+++ b/src/main/java/net/lamgc/cgj/Main.java
@@ -129,10 +129,10 @@ public class Main {
         if(env != null) {
             System.setProperty("cgj." + sysPropKey, env);
             return true;
-        } else {
+        } else if(defaultValue != null) {
             System.setProperty("cgj." + sysPropKey, defaultValue);
-            return false;
         }
+        return false;
     }
 
     @Command