From 4cb586238c078799d91e4f22a662aa00fea24eef Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期五, 17 十月 2025 17:27:45 +0800
Subject: [PATCH] 适配存储到数据库的文件; 不需要存储到数据库的，若是集群，那么同步到集群的其他节点； 若是失败，定时任务重试，至多3次
---
src/main/java/com/product/file/service/MergeDoc.java | 3 ++-
1 files changed, 2 insertions(+), 1 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..607e133 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);
--
Gitblit v1.9.2