From 2ba1e026deb6772ddf6bf28093fc3b6d194b32eb Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 10 Apr 2020 15:25:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
index c4801ad..185051f 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
@@ -10,10 +10,10 @@
   application:
     name: usercenter-server
   datasource:
-    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     username: ${kidgrow.datasource.username}
     password: ${kidgrow.datasource.password}
-    driver-class-name: com.mysql.jdbc.Driver
+#    driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       aop-patterns: com.kidgrow.usercenter.controller.*,com.kidgrow.usercenter.mapper.*
@@ -63,6 +63,13 @@
       - sys_role
       - sys_menu
       - sys_user_logs
+      - sys_organization
+      - sys_user_org
+      - sys_dictionaries
+      - sys_hospital
+      - sys_doctor
+      - sys_department
+      - sys_area
     ignoreSqls:
       - com.kidgrow.usercenter.mapper.SysRoleMapper.findAll
 

--
Gitblit v1.8.0