From dcd7e524e4c47d8e14a08135ca17a9f73d921254 Mon Sep 17 00:00:00 2001
From: chenzz <cs.chenzz@qq.com>
Date: Mon, 26 Nov 2018 14:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95,=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=AE=A1=E7=90=86tree=E6=8E=A7=E4=BB=B6=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80/=E6=8A=98=E5=8F=A0=E4=B8=8D=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=8D=87=E7=BA=A7springboot=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=B02.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 2 +-
 ruoyi-admin/src/main/resources/application-druid.yml     | 4 ++--
 ruoyi-admin/src/main/resources/static/ruoyi/js/common.js | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 20f6855cb..f14adeb2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.0.5.RELEASE</version>
+                <version>2.1.0.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index da7a23d52..326d1c375 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -2,11 +2,11 @@
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.jdbc.Driver
+        driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
+                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: password
             # 从库数据源
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index 9f56a6ac0..61dacd9d3 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -107,9 +107,9 @@ $(function() {
 	var expandFlag = false;
 	$("#expandAllBtn").click(function() {
 	    if (expandFlag) {
-	        $('#bootstrap-table').bootstrapTreeTable('expandAll');
+	        $('#bootstrap-tree-table').bootstrapTreeTable('expandAll');
 	    } else {
-	        $('#bootstrap-table').bootstrapTreeTable('collapseAll');
+	        $('#bootstrap-tree-table').bootstrapTreeTable('collapseAll');
 	    }
 	    expandFlag = expandFlag ? false: true;
 	})