完善启动脚本

gitchenjh · klboke · commit 02e116fd8aec · 2019-04-16T16:11:22.000+08:00
diff --git 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
diff --git 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 &
diff --git 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 @@ class ConfigRefreshThread implements Runnable {
         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);
                 }
