From f63a28c6767595eed775f233eb1316a801c53253 Mon Sep 17 00:00:00 2001
From: monkeyk7 <monkeyk1987@gmail.com>
Date: Thu, 4 Jun 2020 22:35:23 +0800
Subject: [PATCH] =?UTF-8?q?>=E5=8D=87=E7=BA=A7Spring-Boot=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E4=B8=BA2.1.4.RELEASE,=20=E5=B9=B6=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 3 ++-
pom.xml | 2 +-
src/main/resources/application.properties | 7 +++++--
src/test/resources/application-test.properties | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 10fc216..e744b44 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Base on Spring-Boot
<ol>
<li>JDK (1.8.0_40)</li>
<li>Servlet (3.1.0)</li>
- <li>Spring Boot(2.0.2.RELEASE)</li>
+ <li>Spring Boot(2.1.4.RELEASE)</li>
</ol>
<h4>技术视频</h4>
<a href="http://list.youku.com/albumlist/show/id_51900110.html" target="_blank">http://list.youku.com/albumlist/show/id_51900110.html</a>
@@ -172,6 +172,7 @@ Base on Spring-Boot
<ol>
<li><p><del>Fix CVE-2019-3778, use spring-security-oauth 2.3.5.RELEASE</del></p></li>
<li><p><del>解决数据库多条 access_token问题，增加唯一约束</del></p></li>
+ <li><p><del>升级Spring-Boot版本为2.1.4.RELEASE</del></p></li>
</ol>
<br/>
</li>
diff --git a/pom.xml b/pom.xml
index a4e7e39..6146006 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.0.2.RELEASE</version>
+ <version>2.1.4.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e3030f5..b586faa 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,8 +4,8 @@ spring.application.name=spring-oauth-server
#
# MySQL
#####################
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/oauth2_boot?autoReconnect=true&autoReconnectForPools=true&useUnicode=true&characterEncoding=utf8
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://localhost:3306/oauth2_boot?autoReconnect=true&autoReconnectForPools=true&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
spring.datasource.username=andaily
spring.datasource.password=andaily
#Datasource properties
@@ -30,6 +30,9 @@ logging.level.root=INFO
# Support deploy to a servlet-container
spring.jmx.enabled=false
#
+#
+spring.main.allow-bean-definition-overriding=true
+#
# Redis
#
#spring.redis.host=localhost
diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
index eeaed5d..da195f6 100644
--- a/src/test/resources/application-test.properties
+++ b/src/test/resources/application-test.properties
@@ -5,7 +5,7 @@ spring.application.name=spring-oauth-server
# MySQL
#####################
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/oauth2_boot_test?autoReconnect=true&autoReconnectForPools=true&useUnicode=true&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://localhost:3306/oauth2_boot_test?autoReconnect=true&autoReconnectForPools=true&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
spring.datasource.username=andaily
spring.datasource.password=andaily
#Datasource properties