调整项目模块，jodconverter-core重命名为office-plugin。jdocnverter-web重命名为server

office-plugin/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.keking</groupId>
-    <artifactId>jodconverter-core</artifactId>
+    <artifactId>office-plugin</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>

office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java

@@ -19,6 +19,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+import org.artofsolving.jodconverter.util.ConfigUtils;
 import org.artofsolving.jodconverter.util.PlatformUtils;
 
 import com.sun.star.beans.PropertyValue;
@@ -55,7 +56,7 @@ public class OfficeUtils {
                 Map<String,Object> subProperties = (Map<String,Object>) value;
                 value = toUnoProperties(subProperties);
             }
-            propertyValues[i++] = property((String) entry.getKey(), value);
+            propertyValues[i++] = property(entry.getKey(), value);
         }
         return propertyValues;
     }
@@ -68,7 +69,7 @@ public class OfficeUtils {
 
     public static File getDefaultOfficeHome() {
         Properties properties = new Properties();
-        String customizedConfigPath = getCustomizedConfigPath();
+        String customizedConfigPath = ConfigUtils.getCustomizedConfigPath();
         try {
             BufferedReader bufferedReader = new BufferedReader(new FileReader(customizedConfigPath));
             properties.load(bufferedReader);
@@ -80,7 +81,7 @@ public class OfficeUtils {
         }
         if (PlatformUtils.isWindows()) {
             // %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
-            String homePath = OfficeUtils.getHomePath();
+            String homePath = ConfigUtils.getHomePath();
             String programFiles = System.getenv("ProgramFiles(x86)");
             if (programFiles == null) {
                 programFiles = System.getenv("ProgramFiles");
@@ -127,30 +128,7 @@ public class OfficeUtils {
         }
     }
 
-    public static String getHomePath() {
-        String userDir = System.getenv("KKFILEVIEW_BIN_FOLDER");
-        if (userDir == null) {
-            userDir = System.getProperty("user.dir");
-        }
-        if (userDir.endsWith("bin")) {
-            userDir = userDir.substring(0, userDir.length() - 4);
-        } else {
-            String separator = File.separator;
-            if (userDir.contains("jodconverter-web")) {
-                userDir = userDir + separator + "src" + separator +  "main";
-            } else {
-                userDir = userDir + separator + "jodconverter-web" + separator + "src" + separator + "main";
-            }
-        }
-        return userDir;
-    }
 
-    public static String getCustomizedConfigPath() {
-        String homePath = OfficeUtils.getHomePath();
-        String separator = java.io.File.separator;
-        String configFilePath = homePath + separator + "config" + separator + "application.properties";
-        return configFilePath;
-    }
 
     /**
      * SpringBoot application.properties 支持从环境变量获取值

office-plugin/src/main/java/org/artofsolving/jodconverter/util/ConfigUtils.java

@@ -0,0 +1,36 @@
+package org.artofsolving.jodconverter.util;
+
+
+import java.io.File;
+
+/**
+ * @author : kl
+ **/
+public class ConfigUtils {
+
+    private static final String MAIN_DIRECTORY_NAME = "server";
+
+    public static String getHomePath() {
+        String userDir = System.getenv("KKFILEVIEW_BIN_FOLDER");
+        if (userDir == null) {
+            userDir = System.getProperty("user.dir");
+        }
+        if (userDir.endsWith("bin")) {
+            userDir = userDir.substring(0, userDir.length() - 4);
+        } else {
+            String separator = File.separator;
+            if (userDir.contains(MAIN_DIRECTORY_NAME)) {
+                userDir = userDir + separator + "src" + separator +  "main";
+            } else {
+                userDir = userDir + separator + MAIN_DIRECTORY_NAME + separator + "src" + separator + "main";
+            }
+        }
+        return userDir;
+    }
+
+    public static String getCustomizedConfigPath() {
+        String homePath = getHomePath();
+        String separator = java.io.File.separator;
+        return homePath + separator + "config" + separator + "application.properties";
+    }
+}

pom.xml

@@ -7,8 +7,8 @@
     <artifactId>filepreview</artifactId>
     <version>2.2.1</version>
     <modules>
-        <module>jodconverter-core</module>
-        <module>jodconverter-web</module>
+        <module>office-plugin</module>
+        <module>server</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -33,5 +33,5 @@
     </profiles>
 
     <name>file-online-preview</name>
-    <description>Demo project for Spring Boot</description>
+    <description>专注文件在线预览服务</description>
 </project>