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 @@
${fst.version}
-
+
@@ -97,8 +97,9 @@
- dom4j
+ org.dom4j
dom4j
+ ${dom4j.version}
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 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.8.RELEASE
+ 2.2.5.RELEASE
com.jeesite
@@ -22,40 +22,41 @@
2.6
- 1.3.3
- 1.9.3
- 1.3
- 1.9.7
+ 1.4
+ 1.9.4
+ 1.8
+ 1.10.7
2.57
- 20180130
- 1.2.61
- 2.10.0.pr1
- 1.11.3
+
+ 1.2.62
+ 2.10.2
+ 2.1.1
+ 1.12.2
1.5
1.1.1
1.21
- 0.4.8
- 3.4.1
- 1.1.0
+ 0.4.11
+ 3.5
+ 1.1.2
0.1.5
- 3.3.2
- 3.16
+ 3.4.0
+ 4.1.2
2.5.1
- 3.4.6
- 1.3.3
- 1.1
- 1.1.18
- 1.4.2
- 2.7.0-release
- 3.0-SNAPSHOT
- 1.5.20
+ 3.5.4
+ 2.0.3
+ 3.1
+ 1.1.21
+ 1.5.1
+ 2.8.0-release
+ 3.0.19-SNAPSHOT
+ 1.6.0
1.8
- 8.5.51
+
true
2.18.1
false
@@ -269,7 +270,7 @@
-
+
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