同步OpenAuth.Core

修复mvc三级菜单;
Reposiroty单元测试读取webapi配置文件;
修复日志打印2次;
This commit is contained in:
yubaolee
2021-02-20 22:06:02 +08:00
parent ecc32d4173
commit 679dc613c1
13 changed files with 126 additions and 21 deletions

View File

@@ -126,6 +126,14 @@ namespace OpenAuth.App
public List<KeyDescription> GetProperties(string moduleCode)
{
var allprops = _dbExtension.GetProperties(moduleCode);
//如果是系统模块直接返回所有字段。防止开发者把模块配置成系统模块还在外层调用loginContext.GetProperties("xxxx");
bool? isSysModule = UnitWork.FirstOrDefault<Module>(u => u.Code == moduleCode)?.IsSys;
if (isSysModule!= null && isSysModule.Value)
{
return allprops;
}
var props =UnitWork.Find<Relevance>(u =>
u.Key == Define.ROLEDATAPROPERTY && _userRoleIds.Contains(u.FirstId) && u.SecondId == moduleCode)
.Select(u => u.ThirdId);

View File

@@ -98,7 +98,7 @@ namespace OpenAuth.App
UnitWork.Add(flowInstance);
wfruntime.flowInstanceId = flowInstance.Id;
if (flowInstance.FrmType == 1)
if (flowInstance.FrmType == 1) //如果是开发者自定义的表单
{
var t = Type.GetType("OpenAuth.App."+ flowInstance.DbName +"App");
ICustomerForm icf = (ICustomerForm) _serviceProvider.GetService(t);

View File

@@ -1,7 +1,16 @@
namespace OpenAuth.App.Interface
{
/// <summary>
/// 开发者自定义表单的统一接口
/// <para>例如FrmLeaveReqApp为请假表单对应的应用层实现该接口可以自动向数据库中插入对应的记录</para>
/// </summary>
public interface ICustomerForm
{
/// <summary>
/// 该接口定义自定义表单模式时需实现向数据库写入表单数据
/// </summary>
/// <param name="flowInstanceId">表单对应的流程实例ID</param>
/// <param name="frmData">表单数据</param>
void Add(string flowInstanceId, string frmData);
}
}