From 02e116fd8aecee5969961b6dcd58305d7eb45d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Sun, 14 Apr 2019 22:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=AF=E5=8A=A8=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jodconverter-web/src/main/bin/startup.bat                   | 6 ++++++
 jodconverter-web/src/main/bin/startup.sh                    | 6 ++++++
 .../main/java/cn/keking/config/ConfigRefreshComponent.java  | 6 ++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/jodconverter-web/src/main/bin/startup.bat b/jodconverter-web/src/main/bin/startup.bat
index a36b0519..a3facb6e 100644
--- a/jodconverter-web/src/main/bin/startup.bat
+++ b/jodconverter-web/src/main/bin/startup.bat
@@ -1 +1,7 @@
+@echo off
+set "KKFILEVIEW_BIN_FOLDER=%cd%"
+cd "%KKFILEVIEW_BIN_FOLDER%"
+echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
+echo Starting kkFileView...
+echo Please check log file for more information
 java -Dspring.config.location=..\conf\application.properties -jar jodconverter-web-1.5.8.RELEASE.jar -> ..\log\kkFileView.log
\ No newline at end of file
diff --git a/jodconverter-web/src/main/bin/startup.sh b/jodconverter-web/src/main/bin/startup.sh
index 0c41c676..f452b834 100644
--- a/jodconverter-web/src/main/bin/startup.sh
+++ b/jodconverter-web/src/main/bin/startup.sh
@@ -1,2 +1,8 @@
 #!/bin/bash
+KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")";pwd)
+export KKFILEVIEW_BIN_FOLDER=$KKFILEVIEW_BIN_FOLDER
+cd $KKFILEVIEW_BIN_FOLDER
+echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER"
+echo "Starting kkFileView..."
+echo "Please check log file for more information"
 nohup java -Dspring.config.location=../conf/application.properties -jar jodconverter-web-1.5.8.RELEASE.jar ../log/kkFileView.log 2>&1 &
\ No newline at end of file
diff --git a/jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java b/jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java
index 2e90eea4..3fba26a4 100644
--- a/jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java
+++ b/jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java
@@ -32,8 +32,10 @@ public class ConfigRefreshComponent {
         public void run() {
             try {
                 Properties properties = new Properties();
-                String userDir = System.getProperty("user.dir");
-                Properties properties1 = System.getProperties();
+                String userDir = System.getenv("KKFILEVIEW_BIN_FOLDER");
+                if (userDir == null) {
+                    System.getProperty("user.dir");
+                }
                 if (userDir.endsWith("bin")) {
                     userDir = userDir.substring(0, userDir.length() - 4);
                 }