From f8b82c489a661ec6ec2cbbc7ff1c74a17cc035c6 Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期二, 20 九月 2022 09:46:46 +0800
Subject: [PATCH] JAQ自定义公式问题修复

---
 src/main/java/com/ots/project/tool/ShellTool.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ots/project/tool/ShellTool.java b/src/main/java/com/ots/project/tool/ShellTool.java
index ce2612f..1e2b8b1 100644
--- a/src/main/java/com/ots/project/tool/ShellTool.java
+++ b/src/main/java/com/ots/project/tool/ShellTool.java
@@ -10,10 +10,12 @@
         StringBuilder builder = new StringBuilder();
         if (os.toLowerCase().startsWith("mac")) {
             builder.append("/Applications/LibreOffice.app/Contents/MacOS/soffice --headless --convert-to ");
+        } else if(os.contains("Windows")){
+            builder.append("cmd /c start soffice --headless --convert-to ");
         } else {
             builder.append("libreoffice6.4 --headless --convert-to ");
         }
-        builder.append(type).append(" ");
+        builder.append(type).append(":impress_pdf_Export ");
         builder.append("--outdir " + targetPath).append(" ");
         builder.append(sourcePath).append(" ");
         
@@ -26,6 +28,7 @@
         }
         return exec(builder.toString());
     }
+
     private static String exec(String command) {
         String returnString = "";
         Runtime runTime = Runtime.getRuntime();
@@ -49,6 +52,6 @@
         return returnString;
     }
     public static void main(String[] args) {
-        System.out.println(exec("libreoffice6.4 --headless --convert-to  /root/灏忕孩.docx 灏忕孩.pdf "));
+        //System.out.println(exec("soffice.exe --headless --invisible --convert-to  D:/ots/uploadPath/upload/2021/02/28/01e01cf7e372ba8b1c5d24b8d69a46f8.docx 01e01cf7e372ba8b1c5d24b8d69a46f8.pdf "));
     }
 }

--
Gitblit v1.9.1