From 2eee70a366153e1bc6d8eba4fbdda00c952a65a1 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 1 Mar 2020 14:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=20springbo?=
 =?UTF-8?q?ot=202.2.5=E3=80=81mybatis=203.5.4=E3=80=81mybatis-spring=202.0?=
 =?UTF-8?q?.3=E3=80=81jsqlparser=203.1=E3=80=81druid=201.1.21=E3=80=81shir?=
 =?UTF-8?q?o=201.5.1=E3=80=81j2cache=202.8.0=E3=80=81beetl=203.0.19=20comm?=
 =?UTF-8?q?ons-fileupload=201.4=E3=80=81commons-beanutils=201.9.4=E3=80=81?=
 =?UTF-8?q?commons-text=201.8=E3=80=81ant=201.10.7=E3=80=81fastjson=201.2.?=
 =?UTF-8?q?62=E3=80=81jackson=202.10.2=E3=80=81dom4j=202.1.1=E3=80=81jsoup?=
 =?UTF-8?q?=201.12.2=E3=80=81thumbnailator=200.4.11=E3=80=81twelvemonkeys?=
 =?UTF-8?q?=203.5=E3=80=81blade-patchca=201.1.2=E3=80=81zxing=203.4.0?=
 =?UTF-8?q?=E3=80=81poi=204.1.2=EF=BC=9B=E4=BB=A5=E5=8F=8Aspringboot?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BA=93=E5=90=8C=E6=AD=A5=E8=B7=9F=E9=9A=8F?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=EF=BC=8C=E5=A6=82=EF=BC=9Aspring=20framework?=
 =?UTF-8?q?=205.2.4=E3=80=81tomcat=209.0.31=E3=80=81mysql=20jdbc=208.0?=
 =?UTF-8?q?=E3=80=81postgresql=2042.2=20=E7=AD=89=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pom.xml                                |  7 +--
 .../jeesite/common/utils/word/WordExport.java |  8 +--
 modules/core/src/test/java/application.yml    |  4 +-
 parent/pom.xml                                | 51 ++++++++++---------
 web/src/main/resources/config/application.yml |  4 +-
 5 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index a703a974..c92ee2eb 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -67,12 +67,12 @@
 			<version>${fst.version}</version>
 		</dependency>
 		
-		<!-- Json in java -->
+		<!-- Json in java
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
 			<version>${json.version}</version>
-		</dependency>
+		</dependency> -->
 		
 		<!-- Fast json -->
 		<dependency>
@@ -97,8 +97,9 @@
 		
 		<!-- Java xml -->
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
+			<version>${dom4j.version}</version>
 		</dependency>
 		
 		<!-- XPath xml -->
diff --git a/common/src/main/java/com/jeesite/common/utils/word/WordExport.java b/common/src/main/java/com/jeesite/common/utils/word/WordExport.java
index 821db15f..22b39a45 100644
--- a/common/src/main/java/com/jeesite/common/utils/word/WordExport.java
+++ b/common/src/main/java/com/jeesite/common/utils/word/WordExport.java
@@ -11,7 +11,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.poi.POIXMLDocument;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
@@ -44,11 +45,12 @@ public class WordExport {
 	 */
 	public void setTemplate(String templatePath) {
 		try {
-			this.document = new XWPFDocument(POIXMLDocument.openPackage(templatePath));
-
+			this.document = new XWPFDocument(OPCPackage.open(templatePath));
 			bookMarks = new BookMarks(document);
 		} catch (IOException e) {
 			e.printStackTrace();
+		} catch (InvalidFormatException e) {
+			e.printStackTrace();
 		}
 	}
 
diff --git a/modules/core/src/test/java/application.yml b/modules/core/src/test/java/application.yml
index 33b00fdf..ac50b348 100644
--- a/modules/core/src/test/java/application.yml
+++ b/modules/core/src/test/java/application.yml
@@ -12,8 +12,8 @@ jdbc:
   
   # Mysql 数据库配置
   type: mysql
-  driver: com.mysql.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+  driver: com.mysql.cj.jdbc.Driver
+  url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC
   username: root
   password: 123456
   testSql: SELECT 1
diff --git a/parent/pom.xml b/parent/pom.xml
index d1d9804c..eb4fd36d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.8.RELEASE</version>
+		<version>2.2.5.RELEASE</version>
 	</parent>
 	
 	<groupId>com.jeesite</groupId>
@@ -22,40 +22,41 @@
 		
 		<!-- common version setting -->
 		<commons-io.version>2.6</commons-io.version>
-		<commons-fileupload.version>1.3.3</commons-fileupload.version>
-		<commons-beanutils.version>1.9.3</commons-beanutils.version>
-		<commons-text.version>1.3</commons-text.version>
-		<ant.version>1.9.7</ant.version>
+		<commons-fileupload.version>1.4</commons-fileupload.version>
+		<commons-beanutils.version>1.9.4</commons-beanutils.version>
+		<commons-text.version>1.8</commons-text.version>
+		<ant.version>1.10.7</ant.version>
 		<fst.version>2.57</fst.version>
-		<json.version>20180130</json.version>
-		<fastjson.version>1.2.61</fastjson.version>
-		<jackson.version>2.10.0.pr1</jackson.version>
-		<jsoup.version>1.11.3</jsoup.version>
+		<!-- <json.version>20180130</json.version> -->
+		<fastjson.version>1.2.62</fastjson.version>
+		<jackson.version>2.10.2</jackson.version>
+		<dom4j.version>2.1.1</dom4j.version>
+		<jsoup.version>1.12.2</jsoup.version>
 		<commons-email.version>1.5</commons-email.version>
 		<activation.version>1.1.1</activation.version>
 		<UserAgentUtils.version>1.21</UserAgentUtils.version>
 		<!-- <metadata-extractor.version>2.11.0</metadata-extractor.version> -->
-		<thumbnailator.version>0.4.8</thumbnailator.version>
-		<twelvemonkeys.version>3.4.1</twelvemonkeys.version>
-		<blade-patchca.version>1.1.0</blade-patchca.version>
+		<thumbnailator.version>0.4.11</thumbnailator.version>
+		<twelvemonkeys.version>3.5</twelvemonkeys.version>
+		<blade-patchca.version>1.1.2</blade-patchca.version>
 		<jmimemagic.version>0.1.5</jmimemagic.version>
-		<zxing.version>3.3.2</zxing.version>
-		<poi.version>3.16</poi.version>
+		<zxing.version>3.4.0</zxing.version>
+		<poi.version>4.1.2</poi.version>
 		<pinyin4j.version>2.5.1</pinyin4j.version>
 		
 		<!-- framework version setting -->
-		<mybatis.version>3.4.6</mybatis.version>
-		<mybatis-spring.version>1.3.3</mybatis-spring.version>
-		<jsqlparser.version>1.1</jsqlparser.version>
-		<druid.version>1.1.18</druid.version>
-		<shiro.version>1.4.2</shiro.version>
-		<j2cache.version>2.7.0-release</j2cache.version>
-		<beetl.version>3.0-SNAPSHOT</beetl.version>
-		<swagger.version>1.5.20</swagger.version>
+		<mybatis.version>3.5.4</mybatis.version>
+		<mybatis-spring.version>2.0.3</mybatis-spring.version>
+		<jsqlparser.version>3.1</jsqlparser.version>
+		<druid.version>1.1.21</druid.version>
+		<shiro.version>1.5.1</shiro.version>
+		<j2cache.version>2.8.0-release</j2cache.version>
+		<beetl.version>3.0.19-SNAPSHOT</beetl.version>
+		<swagger.version>1.6.0</swagger.version>
 		
 		<!-- environment setting -->
 		<java.version>1.8</java.version>
-		<tomcat.version>8.5.51</tomcat.version>
+		<!-- <tomcat.version>9.0.31</tomcat.version> -->
 		<maven.test.skip>true</maven.test.skip>
 		<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version><!-- 降级到该版本，新版本可能会出现VM崩溃 -->
 		<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
@@ -269,7 +270,7 @@
 					</configuration>
 				</plugin>
 				
-				<!-- 依赖插件 -->
+				<!-- 依赖插件
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -292,7 +293,7 @@
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>
-				</plugin>
+				</plugin> -->
 			</plugins>
 			
 		</pluginManagement>
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 00b46443..05530b3f 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -38,8 +38,8 @@ jdbc:
   
   # Mysql 数据库配置
   type: mysql
-  driver: com.mysql.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+  driver: com.mysql.cj.jdbc.Driver
+  url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC
   username: root
   password: 123456
   testSql: SELECT 1