manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级依赖 springboot 2.2.5、mybatis 3.5.4、mybatis-spring 2.0.3、jsqlparser

Browse Source 
3.1、druid 1.1.21、shiro 1.5.1、j2cache 2.8.0、beetl 3.0.19
commons-fileupload 1.4、commons-beanutils 1.9.4、commons-text 1.8、ant
1.10.7、fastjson 1.2.62、jackson 2.10.2、dom4j 2.1.1、jsoup
1.12.2、thumbnailator 0.4.11、twelvemonkeys 3.5、blade-patchca 1.1.2、zxing
3.4.0、poi 4.1.2；以及springboot依赖库同步跟随升级，如：spring framework 5.2.4、tomcat
9.0.31、mysql jdbc 8.0、postgresql 42.2 等等
This commit is contained in:
thinkgem
2020-03-01 14:02:34 +08:00
parent d6b851a616
commit 2eee70a366
5 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/pom.xml
View File

@@ -67,12 +67,12 @@
<version>${fst.version}</version> <version>${fst.version}</version>
</dependency> </dependency>
<!-- Json in java --> <!-- Json in java
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>${json.version}</version> <version>${json.version}</version>
</dependency> </dependency> -->
<!-- Fast json --> <!-- Fast json -->
<dependency> <dependency>
@@ -97,8 +97,9 @@
<!-- Java xml --> <!-- Java xml -->
<dependency> <dependency>
<groupId>dom4j</groupId> <groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId> <artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
</dependency> </dependency>
<!-- XPath xml --> <!-- XPath xml -->

8
common/src/main/java/com/jeesite/common/utils/word/WordExport.java
View File

@@ -11,7 +11,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; 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.ParagraphAlignment;
import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.poi.xwpf.usermodel.XWPFParagraph; import org.apache.poi.xwpf.usermodel.XWPFParagraph;
@@ -44,11 +45,12 @@ public class WordExport {
*/ */
public void setTemplate(String templatePath) { public void setTemplate(String templatePath) {
try { try {
this.document = new XWPFDocument(POIXMLDocument.openPackage(templatePath)); this.document = new XWPFDocument(OPCPackage.open(templatePath));
bookMarks = new BookMarks(document); bookMarks = new BookMarks(document);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} catch (InvalidFormatException e) {
e.printStackTrace();
} }
} }

4
modules/core/src/test/java/application.yml
View File

@@ -12,8 +12,8 @@ jdbc:
# Mysql 数据库配置 # Mysql 数据库配置
type: mysql type: mysql
driver: com.mysql.jdbc.Driver driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC
username: root username: root
password: 123456 password: 123456
testSql: SELECT 1 testSql: SELECT 1

51
parent/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.8.RELEASE</version> <version>2.2.5.RELEASE</version>
</parent> </parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
@@ -22,40 +22,41 @@
<!-- common version setting --> <!-- common version setting -->
<commons-io.version>2.6</commons-io.version> <commons-io.version>2.6</commons-io.version>
<commons-fileupload.version>1.3.3</commons-fileupload.version> <commons-fileupload.version>1.4</commons-fileupload.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version> <commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-text.version>1.3</commons-text.version> <commons-text.version>1.8</commons-text.version>
<ant.version>1.9.7</ant.version> <ant.version>1.10.7</ant.version>
<fst.version>2.57</fst.version> <fst.version>2.57</fst.version>
<json.version>20180130</json.version> <!-- <json.version>20180130</json.version> -->
<fastjson.version>1.2.61</fastjson.version> <fastjson.version>1.2.62</fastjson.version>
<jackson.version>2.10.0.pr1</jackson.version> <jackson.version>2.10.2</jackson.version>
<jsoup.version>1.11.3</jsoup.version> <dom4j.version>2.1.1</dom4j.version>
<jsoup.version>1.12.2</jsoup.version>
<commons-email.version>1.5</commons-email.version> <commons-email.version>1.5</commons-email.version>
<activation.version>1.1.1</activation.version> <activation.version>1.1.1</activation.version>
<UserAgentUtils.version>1.21</UserAgentUtils.version> <UserAgentUtils.version>1.21</UserAgentUtils.version>
<!-- <metadata-extractor.version>2.11.0</metadata-extractor.version> --> <!-- <metadata-extractor.version>2.11.0</metadata-extractor.version> -->
<thumbnailator.version>0.4.8</thumbnailator.version> <thumbnailator.version>0.4.11</thumbnailator.version>
<twelvemonkeys.version>3.4.1</twelvemonkeys.version> <twelvemonkeys.version>3.5</twelvemonkeys.version>
<blade-patchca.version>1.1.0</blade-patchca.version> <blade-patchca.version>1.1.2</blade-patchca.version>
<jmimemagic.version>0.1.5</jmimemagic.version> <jmimemagic.version>0.1.5</jmimemagic.version>
<zxing.version>3.3.2</zxing.version> <zxing.version>3.4.0</zxing.version>
<poi.version>3.16</poi.version> <poi.version>4.1.2</poi.version>
<pinyin4j.version>2.5.1</pinyin4j.version> <pinyin4j.version>2.5.1</pinyin4j.version>
<!-- framework version setting --> <!-- framework version setting -->
<mybatis.version>3.4.6</mybatis.version> <mybatis.version>3.5.4</mybatis.version>
<mybatis-spring.version>1.3.3</mybatis-spring.version> <mybatis-spring.version>2.0.3</mybatis-spring.version>
<jsqlparser.version>1.1</jsqlparser.version> <jsqlparser.version>3.1</jsqlparser.version>
<druid.version>1.1.18</druid.version> <druid.version>1.1.21</druid.version>
<shiro.version>1.4.2</shiro.version> <shiro.version>1.5.1</shiro.version>
<j2cache.version>2.7.0-release</j2cache.version> <j2cache.version>2.8.0-release</j2cache.version>
<beetl.version>3.0-SNAPSHOT</beetl.version> <beetl.version>3.0.19-SNAPSHOT</beetl.version>
<swagger.version>1.5.20</swagger.version> <swagger.version>1.6.0</swagger.version>
<!-- environment setting --> <!-- environment setting -->
<java.version>1.8</java.version> <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.test.skip>true</maven.test.skip>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version><!-- 降级到该版本，新版本可能会出现VM崩溃 --> <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version><!-- 降级到该版本，新版本可能会出现VM崩溃 -->
<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources> <eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
@@ -269,7 +270,7 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- 依赖插件 --> <!-- 依赖插件
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
@@ -292,7 +293,7 @@
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>
</plugin> </plugin> -->
</plugins> </plugins>
</pluginManagement> </pluginManagement>

4
web/src/main/resources/config/application.yml
View File

@@ -38,8 +38,8 @@ jdbc:
# Mysql 数据库配置 # Mysql 数据库配置
type: mysql type: mysql
driver: com.mysql.jdbc.Driver driver: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull url: jdbc:mysql://127.0.0.1:3306/jeesite?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC
username: root username: root
password: 123456 password: 123456
testSql: SELECT 1 testSql: SELECT 1