Docx4jHelper改为使用rich-text模块的

jfcloud-gene-biz/pom.xml

@@ -60,7 +60,6 @@
     <dependency>
       <groupId>com.github.jfcloud</groupId>
       <artifactId>jfcloud-aew-rich-text</artifactId>
-      <version>${jfcloud-dependencies.version}</version>
     </dependency>
 
     <dependency>

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/config/Docx4jHelper.java

@@ -1,54 +0,0 @@
-package com.github.jfcloud.gene.config;
-
-import lombok.extern.slf4j.Slf4j;
-import org.docx4j.Docx4jProperties;
-import org.docx4j.jaxb.BinderListenerUtils;
-import org.docx4j.jaxb.Context;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-import javax.xml.bind.JAXBException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-@Slf4j
-@Component
-public class Docx4jHelper implements ApplicationRunner {
-
-    private static final WordprocessingMLPackage.FilterSettings settings = new WordprocessingMLPackage.FilterSettings();
-
-    @Override
-    public void run(ApplicationArguments args) {
-        //初始化Context和Docx4jProperties，加速文档转换
-        log.info("初始化Docx4j：{}", Context.jcXmlPackage.toString());
-        Docx4jProperties.getProperty("docx4j");
-
-        try {
-            //初始化binderListener
-            BinderListenerUtils.getBinderListener();
-        } catch (JAXBException ignore) {
-        }
-
-        //规范docx语法
-        settings.setTidyForDocx4all(true);
-        log.info("初始化Docx4j完成");
-    }
-
-    /**
-     * 转换docx
-     */
-    public static void convert(InputStream in, OutputStream out) throws Exception {
-        load(in).save(out);
-    }
-
-    /**
-     * 加载docx
-     */
-    public static WordprocessingMLPackage load(InputStream in) throws Exception {
-        WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(in);
-        wordMLPackage.filter(settings);
-        return wordMLPackage;
-    }
-}

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/file/service/impl/FileInfoServiceImpl.java

@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jfcloud.common.core.constant.enums.YesNoEnum;
 import com.github.jfcloud.common.file.core.FileProperties;
 import com.github.jfcloud.common.file.core.FileTemplate;
-import com.github.jfcloud.gene.config.Docx4jHelper;
 import com.github.jfcloud.gene.file.entity.FileInfo;
 import com.github.jfcloud.gene.file.mapper.FileInfoMapper;
 import com.github.jfcloud.gene.file.service.FileInfoService;
@@ -23,6 +22,7 @@ import com.github.jfcloud.gene.file.vo.FileDetail;
 import com.github.jfcloud.gene.file.vo.FileVo;
 import com.github.jfcloud.gene.flow.entity.FlowFileVersion;
 import com.github.jfcloud.gene.util.WordUtil;
+import com.github.jfcloud.rich.config.Docx4jHelper;
 import com.github.jfcloud.web.controller.JfcloudRestController;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

pom.xml

@@ -25,6 +25,7 @@
     <mapstruct.version>1.4.2.Final</mapstruct.version>
     <jfcloud-bom.version>K7.5.1</jfcloud-bom.version>
     <jfcloud-dependencies.version>K7.5.0</jfcloud-dependencies.version>
+    <rich-text.version>K7.5.2</rich-text.version>
   </properties>
 
   <dependencies>
@@ -48,7 +49,7 @@
       <dependency>
         <groupId>com.github.jfcloud</groupId>
         <artifactId>jfcloud-aew-rich-text</artifactId>
-        <version>${jfcloud-dependencies.version}</version>
+        <version>${rich-text.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>