From 237d7c42498806a3ca205f63d151671a45304854 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 28 七月 2022 09:19:11 +0800
Subject: [PATCH] 1. 承诺书pdf生产模块

---
 pom.xml |   68 ++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab5d11b..0ea86a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
         <!-- tk.mybatis -->
         <mapper.plugin>tk.mybatis.mapper.generator.MapperPlugin</mapper.plugin>
         <mapper.Mapper>tk.mybatis.mapper.common.Mapper</mapper.Mapper>
+        <itext.version>7.2.2</itext.version>
     </properties>
 
     <dependencies>
@@ -267,6 +268,19 @@
             <artifactId>poi</artifactId>
             <version>4.1.2</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-excelant -->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi-excelant</artifactId>-->
+<!--            <version>5.2.2</version>-->
+<!--        </dependency>-->
+
 
         <!--闃块噷浜戞帹閫�-->
         <dependency>
@@ -297,27 +311,31 @@
 
 
         <!-- pdf:start -->
+        <!-- https://mvnrepository.com/artifact/com.itextpdf/itext7-core -->
         <dependency>
             <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.13.3</version>
+            <artifactId>itext7-core</artifactId>
+            <version>${itext.version}</version>
+            <type>pom</type>
         </dependency>
-        <dependency>
-            <groupId>com.itextpdf.tool</groupId>
-            <artifactId>xmlworker</artifactId>
-            <version>5.5.13.3</version>
-        </dependency>
-        <!-- 鏀寔涓枃 -->
+        <!-- https://mvnrepository.com/artifact/com.itextpdf/html2pdf -->
         <dependency>
             <groupId>com.itextpdf</groupId>
-            <artifactId>itext-asian</artifactId>
-            <version>5.2.0</version>
+            <artifactId>html2pdf</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.itextpdf/font-asian -->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>font-asian</artifactId>
+            <version>${itext.version}</version>
+            <scope>test</scope>
         </dependency>
         <!-- 鏀寔css鏍峰紡娓叉煋 -->
         <dependency>
             <groupId>org.xhtmlrenderer</groupId>
             <artifactId>flying-saucer-pdf-itext5</artifactId>
-            <version>9.1.22</version>
+            <version>9.1.16</version>
         </dependency>
         <!-- 杞崲html涓烘爣鍑唜html鍖� -->
         <dependency>
@@ -325,7 +343,12 @@
             <artifactId>jtidy</artifactId>
             <version>r938</version>
         </dependency>
-        <!-- pdf:end -->
+        <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.31</version>
+        </dependency>
 
     </dependencies>
 
@@ -429,19 +452,10 @@
             <resource>
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>application-dev.yml</exclude>
-                    <exclude>application-pro.yml</exclude>
-                    <exclude>application.yml</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>application-${profileActive}.yml</include>
-                    <include>application.yml</include>
-                </includes>
+<!--                <includes>-->
+<!--                    <include>*.xml</include>-->
+<!--                    <include>*.yml</include>-->
+<!--                </includes>-->
             </resource>
         </resources>
     </build>
@@ -450,7 +464,7 @@
         <profile>
             <id>dev</id>
             <properties>
-                <profileActive>dev</profileActive>
+                <profile.active>dev</profile.active>
             </properties>
             <activation>
                 <activeByDefault>true</activeByDefault>
@@ -459,7 +473,7 @@
         <profile>
             <id>pro</id>
             <properties>
-                <profileActive>pro</profileActive>
+                <profile.active>pro</profile.active>
             </properties>
             <activation>
                 <activeByDefault>false</activeByDefault>

--
Gitblit v1.9.3