From a72ce23de12389206780e726bd1700c40c7f6a82 Mon Sep 17 00:00:00 2001
From: 林致杰 <1003392067@qq.com>
Date: 星期四, 06 一月 2022 12:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/framework-v7-20211119' into framework-v7-20211119

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

diff --git a/src/main/java/com/ots/project/tool/ShellTool.java b/src/main/java/com/ots/project/tool/ShellTool.java
index de464dd..1e2b8b1 100644
--- a/src/main/java/com/ots/project/tool/ShellTool.java
+++ b/src/main/java/com/ots/project/tool/ShellTool.java
@@ -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