From 9925bc571e1234d96a66063134ab9a9ddfd7c031 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 03 十一月 2025 15:53:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0 into dev
---
src/main/java/com/product/file/util/MergeWordDocuments.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/file/util/MergeWordDocuments.java b/src/main/java/com/product/file/util/MergeWordDocuments.java
index ae56132..698d67d 100644
--- a/src/main/java/com/product/file/util/MergeWordDocuments.java
+++ b/src/main/java/com/product/file/util/MergeWordDocuments.java
@@ -30,8 +30,17 @@
}
}
+ String fileType=".docx";
+ FileFormat saveType = FileFormat.Docx;
+ //鍒ゆ柇鏉ユ簮鏂囦欢鏄惁涓簑ps
+ if (source.getName().endsWith(".wps")) {
+ saveType = FileFormat.WPS;
+ fileType=".wps";
+ }
+
+
// doc.insertTextFromStream(targetIn, com.spire.doc.FileFormat.Docx);
- String tempFile = Global.getSystemConfig("temp.dir", "./attachment/temp") + File.separator + UUID.randomUUID() + ".docx";
+ String tempFile = Global.getSystemConfig("temp.dir", "./attachment/temp") + File.separator + UUID.randomUUID() + fileType;
try (FileOutputStream out = new FileOutputStream(tempFile)) {
sourceDoc.saveToStream(out, FileFormat.Docx);
return new File(tempFile);
--
Gitblit v1.9.2