From 0b57c36ace11b95ce296820a927615a8561d20ae Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期六, 14 九月 2024 19:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev
---
src/main/java/com/product/file/util/PdfConcurrenceUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/product/file/util/PdfConcurrenceUtil.java b/src/main/java/com/product/file/util/PdfConcurrenceUtil.java
index 80d0204..5d053be 100644
--- a/src/main/java/com/product/file/util/PdfConcurrenceUtil.java
+++ b/src/main/java/com/product/file/util/PdfConcurrenceUtil.java
@@ -190,7 +190,7 @@
File outFile = null;
OfficeManager officeManager = null;
try {
- if(Global.getPropertyToBoolean("open.office.isEnable", "true")) {//鍚敤oepn office杞崲
+ if(Global.getPropertyToBoolean("open.office.isEnable", "false")) {//鍚敤oepn office杞崲
officeManager = officeManagerQueue.take();
inputFile = new File(input);
outFile = new File(output);
@@ -200,7 +200,7 @@
}else{
outFile = new File(AsposeUtil.OfficeToPdf(input, output,officeType));
}
-
+
}catch (Exception e) {
outFile = null;
throw e;
--
Gitblit v1.9.2