移除office-plugin, 使用新版jodconverter

server/src/main/java/cn/keking/service/OfficePluginManager.java

@@ -1,12 +1,12 @@
 package cn.keking.service;
 
-import com.sun.star.document.UpdateDocMode;
+import cn.keking.utils.LocalOfficeUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.artofsolving.jodconverter.OfficeDocumentConverter;
-import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
-import org.artofsolving.jodconverter.office.OfficeManager;
-import org.artofsolving.jodconverter.office.OfficeUtils;
-import org.artofsolving.jodconverter.util.PlatformUtils;
+import org.jodconverter.core.office.InstalledOfficeManagerHolder;
+import org.jodconverter.core.office.OfficeException;
+import org.jodconverter.core.office.OfficeUtils;
+import org.jodconverter.core.util.OSUtils;
+import org.jodconverter.local.office.LocalOfficeManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,16 +21,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 创建文件转换器
  *
- * @author yudian-it
- * @date 2017/11/13
+ * @author chenjh
+ * @since 2022-12-15
  */
 @Component
 @Order(Ordered.HIGHEST_PRECEDENCE)
@@ -38,7 +35,7 @@ public class OfficePluginManager {
 
     private final Logger logger = LoggerFactory.getLogger(OfficePluginManager.class);
 
-    private OfficeManager officeManager;
+    private LocalOfficeManager officeManager;
 
     @Value("${office.plugin.server.ports:2001,2002}")
     private String serverPorts;
@@ -50,8 +47,8 @@ public class OfficePluginManager {
      * 启动Office组件进程
      */
     @PostConstruct
-    public void startOfficeManager() {
-        File officeHome = OfficeUtils.getDefaultOfficeHome();
+    public void startOfficeManager() throws OfficeException {
+        File officeHome = LocalOfficeUtils.getDefaultOfficeHome();
         if (officeHome == null) {
             throw new RuntimeException("找不到office组件，请确认'office.home'配置是否有误");
         }
@@ -60,45 +57,26 @@ public class OfficePluginManager {
             logger.warn("检测到有正在运行的office进程，已自动结束该进程");
         }
         try {
-            DefaultOfficeManagerConfiguration configuration = new DefaultOfficeManagerConfiguration();
-            configuration.setOfficeHome(officeHome);
             String[] portsString = serverPorts.split(",");
-
             int[] ports = Arrays.stream(portsString).mapToInt(Integer::parseInt).toArray();
-
-            configuration.setPortNumbers(ports);
             long timeout = DurationStyle.detectAndParse(timeOut).toMillis();
-            // 设置任务执行超时为5分钟
-            configuration.setTaskExecutionTimeout(timeout);
-            // 设置任务队列超时为24小时
-            //configuration.setTaskQueueTimeout(1000 * 60 * 60 * 24L);
-            officeManager = configuration.buildOfficeManager();
+            officeManager = LocalOfficeManager.builder()
+                    .officeHome(officeHome)
+                    .portNumbers(ports)
+                    .processTimeout(timeout)
+                    .build();
             officeManager.start();
+            InstalledOfficeManagerHolder.setInstance(officeManager);
         } catch (Exception e) {
             logger.error("启动office组件失败，请检查office组件是否可用");
             throw e;
         }
     }
 
-    public OfficeDocumentConverter getDocumentConverter() {
-        OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager, new OfficePluginExtendFormatRegistry());
-        converter.setDefaultLoadProperties(getLoadProperties());
-        return converter;
-    }
-
-    private Map<String, ?> getLoadProperties() {
-        Map<String, Object> loadProperties = new HashMap<>(10);
-        loadProperties.put("Hidden", true);
-        loadProperties.put("ReadOnly", true);
-        loadProperties.put("UpdateDocMode", UpdateDocMode.QUIET_UPDATE);
-        loadProperties.put("CharacterSet", StandardCharsets.UTF_8.name());
-        return loadProperties;
-    }
-
     private boolean killProcess() {
         boolean flag = false;
         try {
-            if (PlatformUtils.isWindows()) {
+            if (OSUtils.IS_OS_WINDOWS) {
                 Process p = Runtime.getRuntime().exec("cmd /c tasklist ");
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 InputStream os = p.getInputStream();
@@ -111,21 +89,7 @@ public class OfficePluginManager {
                     Runtime.getRuntime().exec("taskkill /im " + "soffice.bin" + " /f");
                     flag = true;
                 }
-            } else if (PlatformUtils.isLinux()) {
-                Process p = Runtime.getRuntime().exec(new String[]{"sh", "-c", "ps -ef | grep " + "soffice.bin" + " |grep -v grep | wc -l"});
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                InputStream os = p.getInputStream();
-                byte[] b = new byte[256];
-                while (os.read(b) > 0) {
-                    baos.write(b);
-                }
-                String s = baos.toString();
-                if (!s.startsWith("0")) {
-                    String[] cmd = {"sh", "-c", "ps -ef | grep soffice.bin | grep -v grep | awk '{print \"kill -9 \"$2}' | sh"};
-                    Runtime.getRuntime().exec(cmd);
-                    flag = true;
-                }
-            } else {
+            } else if (OSUtils.IS_OS_MAC || OSUtils.IS_OS_MAC_OSX) {
                 Process p = Runtime.getRuntime().exec(new String[]{"sh", "-c", "ps -ef | grep " + "soffice.bin"});
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 InputStream os = p.getInputStream();
@@ -139,6 +103,20 @@ public class OfficePluginManager {
                     Runtime.getRuntime().exec(cmd);
                     flag = true;
                 }
+            } else {
+                Process p = Runtime.getRuntime().exec(new String[]{"sh", "-c", "ps -ef | grep " + "soffice.bin" + " |grep -v grep | wc -l"});
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                InputStream os = p.getInputStream();
+                byte[] b = new byte[256];
+                while (os.read(b) > 0) {
+                    baos.write(b);
+                }
+                String s = baos.toString();
+                if (!s.startsWith("0")) {
+                    String[] cmd = {"sh", "-c", "ps -ef | grep soffice.bin | grep -v grep | awk '{print \"kill -9 \"$2}' | sh"};
+                    Runtime.getRuntime().exec(cmd);
+                    flag = true;
+                }
             }
         } catch (IOException e) {
             logger.error("检测office进程异常", e);
@@ -150,7 +128,7 @@ public class OfficePluginManager {
     public void destroyOfficeManager() {
         if (null != officeManager && officeManager.isRunning()) {
             logger.info("Shutting down office process");
-            officeManager.stop();
+            OfficeUtils.stopQuietly(officeManager);
         }
     }