From deb94fdd9130b6ec1adfd1960ac9d1e940970f08 Mon Sep 17 00:00:00 2001
From: haiming <brave.yhm@gmail.com>
Date: Thu, 5 Sep 2019 11:33:08 +0800
Subject: [PATCH] =?UTF-8?q?MySQL8.0.15=E6=94=AF=E6=8C=81;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zetark-oauth2-server/pom.xml                               | 2 +-
 .../src/main/resources/resources.properties                | 7 ++++---
 zetark-oauth2-server/src/main/resources/spring-config.xml  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/zetark-oauth2-server/pom.xml b/zetark-oauth2-server/pom.xml
index 15231be..f284f6e 100644
--- a/zetark-oauth2-server/pom.xml
+++ b/zetark-oauth2-server/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.25</version>
+            <version>8.0.11</version>
         </dependency>
 
         <dependency>
diff --git a/zetark-oauth2-server/src/main/resources/resources.properties b/zetark-oauth2-server/src/main/resources/resources.properties
index bb9bf30..3cf3c37 100644
--- a/zetark-oauth2-server/src/main/resources/resources.properties
+++ b/zetark-oauth2-server/src/main/resources/resources.properties
@@ -1,7 +1,7 @@
 #dataSource configure
-connection.url=jdbc:mysql://localhost:3306/shiro-oauth2
+connection.url=jdbc:mysql://localhost:3306/oauth2?useUnicode=true&allowPublicKeyRetrieval=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
 connection.username=root
-connection.password=root
+connection.password=ikmcy2O1904
 #druid datasource
 druid.initialSize=10
 druid.minIdle=10
@@ -9,7 +9,8 @@ druid.maxActive=50
 druid.maxWait=60000
 druid.timeBetweenEvictionRunsMillis=60000
 druid.minEvictableIdleTimeMillis=300000
-druid.validationQuery=SELECT 'x'
+druid.driverClassName=com.mysql.cj.jdbc.Driver
+druid.validationQuery=SELECT 1
 druid.testWhileIdle=true
 druid.testOnBorrow=false
 druid.testOnReturn=false
diff --git a/zetark-oauth2-server/src/main/resources/spring-config.xml b/zetark-oauth2-server/src/main/resources/spring-config.xml
index b52b233..38451c8 100644
--- a/zetark-oauth2-server/src/main/resources/spring-config.xml
+++ b/zetark-oauth2-server/src/main/resources/spring-config.xml
@@ -39,7 +39,7 @@
 
         <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
         <property name="minEvictableIdleTimeMillis" value="${druid.minEvictableIdleTimeMillis}"/>
-
+        <property name="driverClassName" value="${druid.driverClassName}"/>
         <property name="validationQuery" value="${druid.validationQuery}"/>
         <property name="testWhileIdle" value="${druid.testWhileIdle}"/>
         <property name="testOnBorrow" value="${druid.testOnBorrow}"/>