From 9a6140574003ec25e95e0248785843c3598168c4 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 23 八月 2024 16:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0
---
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