Skip to content

Commit 28e0e84

Browse files
dolywdolyw
committed
SpringBoot版本升级到2.5.6
1 parent 52754c0 commit 28e0e84

File tree

8 files changed

+28
-27
lines changed

8 files changed

+28
-27
lines changed

‎pom.xml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.5.16.RELEASE</version>
17+
<version>2.5.6</version>
1818
<relativePath/> <!-- lookup parent from repository -->
1919
</parent>
2020

@@ -31,8 +31,7 @@
3131
<generator.version>1.3.6</generator.version>
3232
<guava.version>23.0</guava.version>
3333
<commons-lang3.version>3.7</commons-lang3.version>
34-
<commons-io.version>2.5</commons-io.version>
35-
<antlr.version>3.2</antlr.version>
34+
<commons-io.version>2.7</commons-io.version>
3635
<rapid.version>4.0.6</rapid.version>
3736
</properties>
3837

@@ -42,6 +41,13 @@
4241
<artifactId>spring-boot-starter</artifactId>
4342
</dependency>
4443

44+
<!--<dependency>
45+
<groupId>org.springframework.boot</groupId>
46+
<artifactId>spring-boot-devtools</artifactId>
47+
<scope>runtime</scope>
48+
<optional>true</optional>
49+
</dependency>-->
50+
4551
<dependency>
4652
<groupId>org.springframework.boot</groupId>
4753
<artifactId>spring-boot-starter-test</artifactId>
@@ -59,11 +65,11 @@
5965
<groupId>org.springframework.boot</groupId>
6066
<artifactId>spring-boot-starter-thymeleaf</artifactId>
6167
</dependency>
62-
<dependency>
68+
<!--<dependency>
6369
<groupId>net.sourceforge.nekohtml</groupId>
6470
<artifactId>nekohtml</artifactId>
6571
<version>1.9.21</version>
66-
</dependency>
72+
</dependency>-->
6773

6874
<!-- Sql-Connector -->
6975
<dependency>

‎src/main/resources/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spring:
3030
# 开发时关闭缓存不然没法看到实时页面
3131
cache: false
3232
# 启用不严格检查
33-
mode: LEGACYHTML5
33+
mode: HTML
3434

3535
mybatis:
3636
# Mybatis配置Mapper路径

‎src/main/resources/config/generator.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 数据源配置(MySql)
2-
jdbc_driver=com.mysql.jdbc.Driver
3-
jdbc_url=jdbc:mysql://127.0.0.1:3306/dev?useSSL=false&useUnicode=true&amp;characterEncoding=UTF-8
2+
jdbc_driver=com.mysql.cj.jdbc.Driver
3+
jdbc_url=jdbc:mysql://127.0.0.1:3306/dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
44
jdbc_username=root
55
jdbc_password=root
66
jdbc_catalog=

‎src/main/resources/templates/table.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
<!-- 数据表格 -->
5252
<el-table v-loading="tableLoading" :data="tableData" @selection-change="handleSelectionChange" border style="width: 100%">
5353
<el-table-column type="selection" align="center" width="55"></el-table-column>
54-
<el-table-column type="index" align="center" min-width="60"/>
55-
<el-table-column prop="tableName" label="表名" align="center" min-width="100" show-overflow-tooltip />
56-
<el-table-column prop="tableComment" label="表注释" align="center" min-width="100" show-overflow-tooltip />
57-
<el-table-column prop="engine" label="表类型" align="center" min-width="80" show-overflow-tooltip />
54+
<el-table-column type="index" align="center" min-width="60"></el-table-column>
55+
<el-table-column prop="tableName" label="表名" align="center" min-width="100" show-overflow-tooltip></el-table-column>
56+
<el-table-column prop="tableComment" label="表注释" align="center" min-width="100" show-overflow-tooltip></el-table-column>
57+
<el-table-column prop="ENGINE" label="表类型" align="center" min-width="80" show-overflow-tooltip></el-table-column>
5858
<el-table-column prop="createTime" label="创建时间" align="center" min-width="100" show-overflow-tooltip>
5959
<template slot-scope="scope">
6060
{{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
@@ -80,12 +80,12 @@
8080
<!-- 表详细弹出框 -->
8181
<el-dialog :title="title" :visible.sync="dialogVisible">
8282
<el-table :data="tableDetailData" height="380" border style="width: 100%">
83-
<el-table-column type="index" align="center" min-width="60"/>
84-
<el-table-column prop="columnName" label="字段名" align="center" min-width="100" show-overflow-tooltip />
85-
<el-table-column prop="columnComment" label="字段注释" align="center" min-width="150" show-overflow-tooltip />
86-
<el-table-column prop="dataType" label="字段类型" align="center" min-width="70" show-overflow-tooltip />
87-
<el-table-column prop="columnKey" label="字段属性" align="center" min-width="60" show-overflow-tooltip />
88-
<el-table-column prop="extra" label="其他属性" align="center" min-width="100" show-overflow-tooltip />
83+
<el-table-column type="index" align="center" min-width="60"></el-table-column>
84+
<el-table-column prop="columnName" label="字段名" align="center" min-width="100" show-overflow-tooltip></el-table-column>
85+
<el-table-column prop="columnComment" label="字段注释" align="center" min-width="150" show-overflow-tooltip></el-table-column>
86+
<el-table-column prop="dataType" label="字段类型" align="center" min-width="70" show-overflow-tooltip></el-table-column>
87+
<el-table-column prop="columnKey" label="字段属性" align="center" min-width="60" show-overflow-tooltip></el-table-column>
88+
<el-table-column prop="extra" label="其他属性" align="center" min-width="100" show-overflow-tooltip></el-table-column>
8989
</el-table>
9090
</el-dialog>
9191

‎src/test/java/com/example/ApplicationTests.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package com.example;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
3+
import org.junit.jupiter.api.Test;
54
import org.springframework.boot.test.context.SpringBootTest;
65
import org.springframework.test.context.TestPropertySource;
7-
import org.springframework.test.context.junit4.SpringRunner;
86

9-
@RunWith(SpringRunner.class)
107
@SpringBootTest
118
@TestPropertySource(value = {"classpath:config/generator.properties"})
129
public class ApplicationTests {

‎src/test/java/com/example/base/BaseTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
package com.example.base;
22

33
import com.example.Application;
4-
import org.junit.runner.RunWith;
54
import org.springframework.boot.test.context.SpringBootTest;
65
import org.springframework.test.annotation.Rollback;
76
import org.springframework.test.context.TestPropertySource;
8-
import org.springframework.test.context.junit4.SpringRunner;
97
import org.springframework.transaction.annotation.Transactional;
108

119
/**
1210
* 单元测试继承该类即可
1311
*/
14-
@RunWith(SpringRunner.class)
1512
@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
1613
@Transactional(rollbackFor = Exception.class)
1714
@TestPropertySource(value = {"classpath:config/generator.properties"})

‎src/test/java/com/example/test/TestRole.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.test;
22

33
import com.example.base.BaseTest;
4-
import org.junit.Test;
4+
import org.junit.jupiter.api.Test;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.boot.test.web.client.TestRestTemplate;
77
import org.springframework.http.ResponseEntity;

‎src/test/java/com/example/test/TestSafeProperties.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import com.example.base.BaseTest;
44
import com.example.util.SafeProperties;
5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
6+
67
import java.io.FileOutputStream;
78
import java.io.InputStream;
89
import java.io.OutputStream;

0 commit comments

Comments
 (0)