移除office-plugin, 使用新版jodconverter

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

@@ -1,7 +1,7 @@
 package cn.keking.service;
 
-import cn.keking.model.FileAttribute;
-import org.artofsolving.jodconverter.OfficeDocumentConverter;
+import org.jodconverter.core.office.OfficeException;
+import org.jodconverter.local.JodConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -15,30 +15,23 @@ import java.io.File;
 public class OfficeToPdfService {
 
     private final static Logger logger = LoggerFactory.getLogger(OfficeToPdfService.class);
-    private final OfficePluginManager officePluginManager;
 
-    public OfficeToPdfService(OfficePluginManager officePluginManager) {
-        this.officePluginManager = officePluginManager;
-    }
-
-    public void openOfficeToPDF(String inputFilePath, String outputFilePath, FileAttribute fileAttribute) {
-        office2pdf(inputFilePath, outputFilePath, fileAttribute);
+    public void openOfficeToPDF(String inputFilePath, String outputFilePath) throws OfficeException {
+        office2pdf(inputFilePath, outputFilePath);
     }
 
 
-    public static void converterFile(File inputFile, String outputFilePath_end, OfficeDocumentConverter converter, FileAttribute fileAttribute) {
+    public static void converterFile(File inputFile, String outputFilePath_end) throws OfficeException {
         File outputFile = new File(outputFilePath_end);
         // 假如目标路径不存在,则新建该路径
         if (!outputFile.getParentFile().exists() && !outputFile.getParentFile().mkdirs()) {
             logger.error("创建目录【{}】失败，请检查目录权限！",outputFilePath_end);
         }
-
-        converter.convert(inputFile, outputFile, fileAttribute.toFileProperties());
+        JodConverter.convert(inputFile).to(outputFile).execute();
     }
 
 
-    public void office2pdf(String inputFilePath, String outputFilePath, FileAttribute fileAttribute) {
-        OfficeDocumentConverter converter = officePluginManager.getDocumentConverter();
+    public void office2pdf(String inputFilePath, String outputFilePath) throws OfficeException {
         if (null != inputFilePath) {
             File inputFile = new File(inputFilePath);
             // 判断目标文件路径是否为空
@@ -47,12 +40,12 @@ public class OfficeToPdfService {
                 String outputFilePath_end = getOutputFilePath(inputFilePath);
                 if (inputFile.exists()) {
                     // 找不到源文件, 则返回
-                    converterFile(inputFile, outputFilePath_end, converter, fileAttribute);
+                    converterFile(inputFile, outputFilePath_end);
                 }
             } else {
                 if (inputFile.exists()) {
                     // 找不到源文件, 则返回
-                    converterFile(inputFile, outputFilePath, converter, fileAttribute);
+                    converterFile(inputFile, outputFilePath);
                 }
             }
         }