From 1f35c75edfde8d204e788f304929b1fb01ddb765 Mon Sep 17 00:00:00 2001
From: zhijie <1003392067@qq.com>
Date: 星期日, 08 八月 2021 21:13:35 +0800
Subject: [PATCH] 1.PAQ简易版（中英泰）支持 2.支持完美水滴生成
---
src/main/java/com/ots/project/tool/ShellTool.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ots/project/tool/ShellTool.java b/src/main/java/com/ots/project/tool/ShellTool.java
index b93fa55..1e2b8b1 100644
--- a/src/main/java/com/ots/project/tool/ShellTool.java
+++ b/src/main/java/com/ots/project/tool/ShellTool.java
@@ -10,8 +10,8 @@
StringBuilder builder = new StringBuilder();
if (os.toLowerCase().startsWith("mac")) {
builder.append("/Applications/LibreOffice.app/Contents/MacOS/soffice --headless --convert-to ");
- } else if(os.toLowerCase().startsWith("windows")){
- builder.append("soffice.exe --headless --invisible --convert-to ");
+ } else if(os.contains("Windows")){
+ builder.append("cmd /c start soffice --headless --convert-to ");
} else {
builder.append("libreoffice6.4 --headless --convert-to ");
}
@@ -28,6 +28,7 @@
}
return exec(builder.toString());
}
+
private static String exec(String command) {
String returnString = "";
Runtime runTime = Runtime.getRuntime();
@@ -51,6 +52,6 @@
return returnString;
}
public static void main(String[] args) {
- System.out.println(exec("soffice.exe --headless --invisible --convert-to D:/ots/uploadPath/upload/2021/02/28/01e01cf7e372ba8b1c5d24b8d69a46f8.docx 01e01cf7e372ba8b1c5d24b8d69a46f8.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