From 4d9483cecdeb9e13a7ea4475121351b02058a51b Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 08 Aug 2020 18:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml | 15 +++++++++++++--
1 files changed, 13 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..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,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.*
@@ -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