同步OpenAuth.Core最新代码

This commit is contained in:
yubaolee
2020-12-17 23:04:04 +08:00
parent 7ce8a219cf
commit 7217e7a924
61 changed files with 1112 additions and 315 deletions

View File

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
using OpenAuth.App.Request;
using OpenAuth.App.Response;
@@ -23,9 +24,9 @@ namespace OpenAuth.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public TableData Load([FromQuery]QueryAppListReq request)
public async Task<TableData> Load([FromQuery]QueryAppListReq request)
{
var applications = _app.GetList(request);
var applications =await _app.GetList(request);
return new TableData
{
data = applications,

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -59,9 +60,10 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableResp<BuilderTableColumn> Load([FromQuery]QueryBuilderTableColumnListReq request)
public async Task<TableResp<BuilderTableColumn>> Load([FromQuery]QueryBuilderTableColumnListReq request)
{
return _app.Load(request);
var tableResp = await _app.Load(request);
return tableResp;
}
/// <summary>

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -67,9 +68,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableResp<BuilderTable> Load([FromQuery]QueryBuilderTableListReq request)
public async Task<TableResp<BuilderTable>> Load([FromQuery]QueryBuilderTableListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -1,5 +1,6 @@
using System;
using Infrastructure;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
using OpenAuth.App.Request;
@@ -58,9 +59,9 @@ using OpenAuth.App.Response;
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryCategoryTypeListReq request)
public async Task<TableData> Load([FromQuery]QueryCategoryTypeListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -87,9 +88,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryCategoryListReq request)
public async Task<TableData> Load([FromQuery]QueryCategoryListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -86,9 +87,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryDataPrivilegeRuleListReq request)
public async Task<TableData> Load([FromQuery]QueryDataPrivilegeRuleListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -128,9 +129,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryFlowInstanceListReq request)
public async Task<TableData> Load([FromQuery]QueryFlowInstanceListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
[HttpPost]

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -76,9 +77,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryFlowSchemeListReq request)
public async Task<TableData> Load([FromQuery]QueryFlowSchemeListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
[HttpPost]

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -76,9 +77,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryFormListReq request)
public async Task<TableData> Load([FromQuery]QueryFormListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
[HttpPost]

View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -87,9 +88,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryOpenJobListReq request)
public async Task<TableData> Load([FromQuery]QueryOpenJobListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -25,9 +26,9 @@ namespace OpenAuth.WebApi.Controllers
_app = app;
}
[HttpGet]
public TableData Load([FromQuery]QueryResourcesReq request)
public async Task<TableData> Load([FromQuery]QueryResourcesReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
[HttpPost]

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -81,9 +82,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QuerySysLogListReq request)
public async Task<TableData> Load([FromQuery]QuerySysLogListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -77,9 +78,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QuerySysMessageListReq request)
public async Task<TableData> Load([FromQuery]QuerySysMessageListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -104,9 +105,9 @@ namespace OpenAuth.WebApi.Controllers
/// 获取当前登录用户可访问的一个部门及子部门全部用户
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryUserListReq request)
public async Task<TableData> Load([FromQuery]QueryUserListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
[HttpPost]
@@ -131,9 +132,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载指定角色的用户
/// </summary>
[HttpGet]
public TableData LoadByRole([FromQuery]QueryUserListByRoleReq request)
public async Task<TableData> LoadByRole([FromQuery]QueryUserListByRoleReq request)
{
return _app.LoadByRole(request);
return await _app.LoadByRole(request);
}
/// <summary>
@@ -141,9 +142,9 @@ namespace OpenAuth.WebApi.Controllers
/// 不包含下级部门的用户
/// </summary>
[HttpGet]
public TableData LoadByOrg([FromQuery]QueryUserListByOrgReq request)
public async Task<TableData> LoadByOrg([FromQuery]QueryUserListByOrgReq request)
{
return _app.LoadByOrg(request);
return await _app.LoadByOrg(request);
}
public UsersController(UserManagerApp app)

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -83,9 +84,9 @@ namespace OpenAuth.WebApi.Controllers
/// </summary>
[HttpGet]
[AllowAnonymous]
public TableData Load([FromQuery]QueryWmsInboundOrderDtblListReq request)
public async Task<TableData> Load([FromQuery]QueryWmsInboundOrderDtblListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
@@ -88,9 +89,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]QueryWmsInboundOrderTblListReq request)
public async Task<TableData> Load([FromQuery]QueryWmsInboundOrderTblListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>

View File

@@ -16,7 +16,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public TableData Load(Query{ClassName}ListReq request)
public async Task<TableData> Load(Query{ClassName}ListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -35,7 +35,7 @@ namespace OpenAuth.App
var objs = GetDataPrivilege("u");
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.Name.Contains(request.key) || u.Id.Contains(request.key));
objs = objs.Where(u => u.Id.Contains(request.key));
}
var propertyStr = string.Join(',', properties.Select(u => u.Key));

View File

@@ -77,9 +77,9 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public TableData Load([FromQuery]Query{ClassName}ListReq request)
public async Task<TableData> Load([FromQuery]Query{ClassName}ListReq request)
{
return _app.Load(request);
return await _app.Load(request);
}
/// <summary>