From 18f1e939da873613f09c54c56806bdd8d83a0c21 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 20 May 2020 23:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=8CCloud=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E4=B8=8B=E4=BB=8E=E5=9F=BA=E7=A1=80=E5=BE=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/config/jeesite-core.yml    | 10 +++---
 web/src/main/resources/config/application.yml | 32 +++++++++++++------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 04c80f46..1302b462 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -133,13 +133,13 @@ user:
   loginCodeCorpUnique: false
 
   # 用户类型配置信息（employee员工，member会员，btype往来单位，persion个人，expert专家，...），JSON 格式说明如下：
-  # {"用户类型":{"dao":"Dao的Bean名称","loginView":"登录页面视图","indexView":"主框架页面视图，支持 redirect: 前缀"}}
+  # {"用户类型":{"beanName":"Service或Dao的Bean名称","loginView":"登录页面视图","indexView":"主框架页面视图，支持 redirect: 前缀"}}
   userTypeMap: >
     {
-      "employee":{"dao":"employeeDao","loginView":"","indexView":"modules/sys/sysIndex"},
-      "member":{"dao":"memberDao","loginView":"","indexView":"modules/sys/sysIndexMember"},
-      "btype":{"dao":"btypeInfoDao","loginView":"","indexView":"modules/sys/sysIndexBtype"},
-      "expert":{"dao":"expertDao","loginView":"","indexView":"modules/sys/sysIndexExpert"}
+      "employee":{"beanName":"employeeService","loginView":"","indexView":"modules/sys/sysIndex"},
+      "member":{"beanName":"memberService","loginView":"","indexView":"modules/sys/sysIndexMember"},
+      "btype":{"beanName":"btypeInfoService","loginView":"","indexView":"modules/sys/sysIndexBtype"},
+      "expert":{"beanName":"expertService","loginView":"","indexView":"modules/sys/sysIndexExpert"}
     }
 
   # 数据权限设置参数，可新增自定义数据权限，moduleCode: 针对模块, ctrlPermi: 权限类型（0全部  1拥有权限  2管理权限）
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index b29277ce..65b239a4 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -228,15 +228,24 @@ logging:
 #
 #  # 系统管理员角色编号（客户方管理员使用的角色）
 #  corpAdminRoleCode: corpAdmin
+#  
+#  # 二级管理员的控制权限类型（1拥有的权限 2管理的权限，管理功能包括：用户管理、组织机构、公司管理等）（v4.1.5+）
+#  adminCtrlPermi: 2
+#  
+#  # 多租户模式（SAAS模式）（专业版）
+#  useCorpModel: false
+#  
+#  # 登录账号是否租户内唯一，否则全局唯一
+#  loginCodeCorpUnique: false
 #
 #  # 用户类型配置信息（employee员工，member会员，btype往来单位，persion个人，expert专家，...），JSON 格式说明如下：
-#  # {"用户类型":{"dao":"Dao的Bean名称","loginView":"登录页面视图","indexView":"主框架页面视图，支持 redirect: 前缀"}}
+#  # {"用户类型":{"beanName":"Service或Dao的Bean名称","loginView":"登录页面视图","indexView":"主框架页面视图，支持 redirect: 前缀"}}
 #  userTypeMap: >
 #    {
-#      "employee":{"dao":"employeeDao","loginView":"","indexView":"modules/sys/sysIndex"},
-#      "member":{"dao":"memberDao","loginView":"","indexView":"modules/sys/sysIndexMember"},
-#      "btype":{"dao":"btypeInfoDao","loginView":"","indexView":"modules/sys/sysIndexBtype"},
-#      "expert":{"dao":"expertDao","loginView":"","indexView":"modules/sys/sysIndexExpert"}
+#      "employee":{"beanName":"employeeService","loginView":"","indexView":"modules/sys/sysIndex"},
+#      "member":{"beanName":"memberService","loginView":"","indexView":"modules/sys/sysIndexMember"},
+#      "btype":{"beanName":"btypeInfoService","loginView":"","indexView":"modules/sys/sysIndexBtype"},
+#      "expert":{"beanName":"expertService","loginView":"","indexView":"modules/sys/sysIndexExpert"}
 #    }
 #
 #  # 数据权限设置参数，可新增自定义数据权限，moduleCode: 针对模块, ctrlPermi: 权限类型, 0全部  1拥有权限  2管理权限
@@ -273,11 +282,14 @@ logging:
 #      remarks: ""
 #    }]
 #    
-#  # 管理功能的控制权限类型（1拥有的权限 2管理的权限）（v4.1.5+）
-#  adminCtrlPermi: 2
-#
-#  # 多租户模式（SAAS模式）（专业版）
-#  useCorpModel: false
+#  # 数据权限调试模式（会输出一些日志）
+#  dataScopeDebug: false
+#    
+#  # 数据权限使用 API 方式实现（适应 Cloud 环境，基础用户表与业务数据表跨库的情况）
+#  # 开启后设置 ctrlDataAttrName 加 AndChildren 后缀，ctrlDataParentCodesAttrName 清空
+#  # 以方便读取树结构数据权限的表时包含子节点，举例如下：
+#  # ctrlDataAttrName: "officeCodesAndChildren", ctrlDataParentCodesAttrName: ""
+#  dataScopeApiMode: false
 
 # 菜单管理
 #menu: