From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 5a5429e..944f1a9 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,7 +10,7 @@
   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
@@ -55,6 +55,7 @@
   tenant:
     enable: true
     #多租户隔离字段
+
     tenantid: tenant_id
     ignoreTables:
       - sys_user
@@ -63,7 +64,17 @@
       - sys_role
       - sys_menu
       - sys_user_logs
+      - sys_organization
+      - sys_user_org
+      - sys_dictionaries
+      - sys_hospital
+      - sys_doctor
+      - sys_department
+      - sys_area
+      - sys_company
+      - sys_role_organization
     ignoreSqls:
       - com.kidgrow.usercenter.mapper.SysRoleMapper.findAll
+      - com.kidgrow.usercenter.mapper.SysUserMapper.findAppointUsers
 
 

--
Gitblit v1.8.0