Merge branch 'release' of ssh://gitlab.gsstcloud.com:10022/poc/poc-api into release_gdghg

# Conflicts:
#	src/main/java/cn/com/poc/common/utils/FileUtils.java
#	src/test/java/cn/com/poc/utils/FileUtilsTest.java

src/main/resources/framemax-config/jdbc-gxsit.properties

+######mysql数据配置示例#######
+hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+hibernate.show_sql=true
+hibernate.format_sql=true
+jdbc.driver=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://192.168.21.31:3306/gsst_modellink_sit?useSSL=false&useUnicode=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
+jdbc.username=modellink_root
+jdbc.password=56a6a2854424
+ds.maxActive=20
+ds.minIdle=1
+ds.initialSize=1
+ds.validationQuery=select 1 from dual
\ No newline at end of file

src/test/java/cn/com/poc/utils/FileUtilsTest.java

-package cn.com.poc.utils;
-
-import cn.com.poc.common.utils.DocumentLoad;
-import cn.com.poc.common.utils.FileUtils;
-import cn.com.yict.framemax.core.spring.SingleContextInitializer;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-import java.io.*;
-
-/**
- * @author alex.yao
- * @date 2025/6/12
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(initializers = SingleContextInitializer.class)
-@WebAppConfiguration
-public class FileUtilsTest {
-
-
-    @Test
-    public void test_wordConvertPDF() throws Exception {
-
-    }
-
-
-    @Test
-    public void test_pdf2word() {
-        try {
-            String pdfFile = "C:\\Users\\52747\\Documents\\dataset\\EMSD_Regulatory_Services_Handbook_LPG16.pdf";
-            String wordFile = "C:\\Users\\52747\\Documents\\dataset\\EMSD_Regulatory_Services_Handbook_LPG16.doc";
-
-            // 加载PDF文档
-            PDDocument pdfDoc = PDDocument.load(new File(pdfFile));
-            int totalPages = pdfDoc.getNumberOfPages();
-
-            // 使用追加模式打开Word文件
-            try (Writer writer = new OutputStreamWriter(new FileOutputStream(wordFile, true), "UTF-8")) {
-                PDFTextStripper stripper = new PDFTextStripper();
-                stripper.setSortByPosition(true);
-                for (int i = 1; i <= totalPages; i++) {
-                    stripper.setStartPage(i);
-                    stripper.setEndPage(i);
-                    String pageText = stripper.getText(pdfDoc);
-
-                    // 追加当前页内容
-                    writer.write(pageText);
-                    writer.write("\f");
-                }
-            }
-            pdfDoc.close();
-            System.out.println("总计追加 " + totalPages + " 页到现有文件");
-        } catch (IOException e) {
-            System.err.println("转换失败：" + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-}
+//package cn.com.poc.utils;
+//
+//import cn.com.poc.common.utils.DocumentLoad;
+//import cn.com.poc.common.utils.FileUtils;
+//import cn.com.yict.framemax.core.spring.SingleContextInitializer;
+//import com.aspose.words.Document;
+//import com.aspose.words.HtmlSaveOptions;
+//import com.aspose.words.HtmlVersion;
+//import com.aspose.words.SaveFormat;
+//import org.apache.pdfbox.pdmodel.PDDocument;
+//import org.apache.pdfbox.text.PDFTextStripper;
+//import org.junit.runner.RunWith;
+//import org.junit.Test;
+//import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+//import org.springframework.test.context.web.WebAppConfiguration;
+//
+//import java.io.*;
+//
+///**
+// * @author alex.yao
+// * @date 2025/6/12
+// */
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@ContextConfiguration(initializers = SingleContextInitializer.class)
+//@WebAppConfiguration
+//public class FileUtilsTest {
+//
+//
+//    @Test
+//    public void test_wordConvertPDF() throws Exception {
+//        String filePath = "";
+//        File file = FileUtils.wordConvertPDF(new File(filePath));
+//        System.out.println(DocumentLoad.loadPDF(file));
+//    }
+//
+//    @Test
+//    public void test_word2html() throws Exception {
+//        String filePath = "C:\\Users\\52747\\Desktop\\test_motionDetailExport.docx";
+//        String dataDir = "C:\\Users\\52747\\Desktop\\";
+//        Document doc = new Document(filePath);
+//        HtmlSaveOptions opts = new HtmlSaveOptions(SaveFormat.HTML);
+//        opts.setHtmlVersion(HtmlVersion.HTML_5);
+//        opts.setExportImagesAsBase64(true);
+//        opts.setExportPageMargins(true);
+//        doc.save(dataDir + "TestFile.html", opts);
+//    }
+//
+//    @Test
+//    public void test_pdf2word() {
+//        try {
+//            String pdfFile = "C:\\Users\\52747\\Documents\\dataset\\EMSD_Regulatory_Services_Handbook_LPG16.pdf";
+//            String wordFile = "C:\\Users\\52747\\Documents\\dataset\\EMSD_Regulatory_Services_Handbook_LPG16.doc";
+//
+//            // 加载PDF文档
+//            PDDocument pdfDoc = PDDocument.load(new File(pdfFile));
+//            int totalPages = pdfDoc.getNumberOfPages();
+//
+//            // 使用追加模式打开Word文件
+//            try (Writer writer = new OutputStreamWriter(new FileOutputStream(wordFile, true), "UTF-8")) {
+//                PDFTextStripper stripper = new PDFTextStripper();
+//                stripper.setSortByPosition(true);
+//                for (int i = 1; i <= totalPages; i++) {
+//                    stripper.setStartPage(i);
+//                    stripper.setEndPage(i);
+//                    String pageText = stripper.getText(pdfDoc);
+//
+//                    // 追加当前页内容
+//                    writer.write(pageText);
+//                    writer.write("\f");
+//                }
+//            }
+//            pdfDoc.close();
+//            System.out.println("总计追加 " + totalPages + " 页到现有文件");
+//        } catch (IOException e) {
+//            System.err.println("转换失败：" + e.getMessage());
+//            e.printStackTrace();
+//        }
+//    }
+//
+//}