ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !42 from chenzz/master

This commit is contained in:
chenzz 2018-11-26 14:49:32 +08:00
parent 553358aa12 dcd7e524e4
commit f0fd7772d7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -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>

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -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
# 从库数据源

4
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
View File

@ -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;
})