From f989fbf9c911227fd07e64f34a5ac36cd41c6501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Thu, 18 Apr 2019 11:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89office.home?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jodconverter/office/OfficeUtils.java      | 20 +++++++++++++++++--
 .../keking/config/ConfigRefreshComponent.java |  4 +---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java
index 98b1c1fd..059a3f83 100644
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java
@@ -12,8 +12,11 @@
 //
 package org.artofsolving.jodconverter.office;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
 import java.util.Map;
+import java.util.Properties;
 
 import org.artofsolving.jodconverter.util.PlatformUtils;
 
@@ -61,8 +64,14 @@ public class OfficeUtils {
     }
 
     public static File getDefaultOfficeHome() {
-        if (System.getProperty("office.home") != null) {
-            return new File(System.getProperty("office.home"));
+        Properties properties = new Properties();
+        String customizedConfigPath = getCustomizedConfigPath();
+        try {
+            BufferedReader bufferedReader = new BufferedReader(new FileReader(customizedConfigPath));
+            properties.load(bufferedReader);
+        } catch (Exception e) {}
+        if (properties.getProperty("office.home") != null) {
+            return new File(properties.getProperty("office.home"));
         }
         if (PlatformUtils.isWindows()) {
             // %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
@@ -127,4 +136,11 @@ public class OfficeUtils {
         return userDir;
     }
 
+    public static String getCustomizedConfigPath() {
+        String homePath = OfficeUtils.getHomePath();
+        String separator = java.io.File.separator;
+        String configFilePath = homePath + separator + "conf" + separator + "application.properties";
+        return configFilePath;
+    }
+
 }
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 8a91da8f..329d8332 100644
--- a/jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java
+++ b/jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java
@@ -42,9 +42,7 @@ public class ConfigRefreshComponent {
                 String convertedFileCharset = sysProperties.getProperty("sun.jnu.encoding");
                 String[] textArray ;
                 String[] mediaArray;
-                String homePath = OfficeUtils.getHomePath();
-                String separator = java.io.File.separator;
-                String configFilePath = homePath + separator + "conf" + separator + "application.properties";
+                String configFilePath = OfficeUtils.getCustomizedConfigPath();
                 while (true) {
                     BufferedReader bufferedReader = new BufferedReader(new FileReader(configFilePath));
                     properties.load(bufferedReader);