From f8b6d9babbc6c2f57da8548fdcbe251f76327c6e Mon Sep 17 00:00:00 2001
From: cheng <1821349743@qq.com>
Date: 星期二, 24 十二月 2024 21:56:36 +0800
Subject: [PATCH] pom 版本升级到 2.1.0-release
---
src/main/java/com/product/file/service/MergeDoc.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/file/service/MergeDoc.java b/src/main/java/com/product/file/service/MergeDoc.java
index cf29496..e40c95f 100644
--- a/src/main/java/com/product/file/service/MergeDoc.java
+++ b/src/main/java/com/product/file/service/MergeDoc.java
@@ -1,6 +1,7 @@
package com.product.file.service;
import cn.hutool.core.io.FileUtil;
+import com.product.file.util.MergeWordDocuments;
import org.apache.xmlbeans.XmlOptions;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBody;
@@ -23,7 +24,7 @@
if (srcDocxs.size() > 1) {
file = srcDocxs.get(0);
for (int i = 1; i < srcDocxs.size(); i++) {
- file = com.product.file.util.FileUtil.mergeFile(file, srcDocxs.get(i));
+ file = MergeWordDocuments.mergeFile(file, srcDocxs.get(i));
}
File file1 = new File(tempFilePath);
FileUtil.copyFile(file, file1);
@@ -61,9 +62,9 @@
String sufix = srcString.substring(srcString.lastIndexOf("<"));
String addPart = appendString.substring(appendString.indexOf(">") + 1,
appendString.lastIndexOf("<"));
- CTBody makeBody = CTBody.Factory.parse(prefix + mainPart + addPart
- + sufix);
- src.set(makeBody);
+// CTBody makeBody = CTBody.Factory.parse(prefix + mainPart + addPart
+// + sufix);
+// src.set(makeBody);
}
}
--
Gitblit v1.9.2