转移.net core 3.1,为.NET 5做准备

This commit is contained in:
ÂëÉñ
2020-10-22 14:59:36 +08:00
parent fd9bca23a7
commit a35d596237
1080 changed files with 175912 additions and 185681 deletions

View File

@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Http;
using System.Web.Mvc;
using Infrastructure;
using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
using OpenAuth.App.Interface;
using OpenAuth.App.Request;
using OpenAuth.Repository.Domain;
@@ -12,8 +12,12 @@ namespace OpenAuth.Mvc.Controllers
{
public class ResourcesController : BaseController
{
public ResourceApp App { get; set; }
private readonly ResourceApp _app;
public ResourcesController(IAuth authUtil, ResourceApp app) : base(authUtil)
{
_app = app;
}
//
// GET: /UserManager/
public ActionResult Index()
@@ -25,32 +29,6 @@ namespace OpenAuth.Mvc.Controllers
return View();
}
/// <summary>
/// 加载特定用户的资源
/// </summary>
/// <param name="appId">应用appId</param>
/// <param name="firstId">用户ID</param>
/// <returns>System.String.</returns>
public string LoadForUser(string appId, string firstId)
{
try
{
var result = new Response<List<string>>
{
Result = App.LoadForUser(appId, firstId).Select(u =>u.Id).ToList()
};
return JsonHelper.Instance.Serialize(result);
}
catch (Exception e)
{
Result.Code = 500;
Result.Message = e.Message;
}
return JsonHelper.Instance.Serialize(Result);
}
/// <summary>
/// 加载角色资源
/// </summary>
@@ -62,32 +40,32 @@ namespace OpenAuth.Mvc.Controllers
{
var result = new Response<List<string>>
{
Result = App.LoadForRole(appId, firstId).Select(u => u.Id).ToList()
Result = _app.LoadForRole(appId, firstId).Select(u => u.Id).ToList()
};
return JsonHelper.Instance.Serialize(result);
}
catch (Exception e)
{
Result.Code = 500;
Result.Message = e.Message;
Result.Message = e.InnerException?.Message ?? e.Message;
}
return JsonHelper.Instance.Serialize(Result);
}
public string Load([FromUri]QueryResourcesReq request)
public string Load([FromQuery]QueryResourcesReq request)
{
return JsonHelper.Instance.Serialize(App.Load(request));
return JsonHelper.Instance.Serialize(_app.Load(request));
}
[System.Web.Mvc.HttpPost]
[HttpPost]
public string Delete(string[] ids)
{
Response resp = new Response();
try
{
App.Delete(ids);
_app.Delete(ids);
}
catch (Exception e)
{
@@ -97,13 +75,13 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(resp);
}
[System.Web.Mvc.HttpPost]
public string Add(Resource obj)
[HttpPost]
public string Add(AddOrUpdateResReq obj)
{
Response resp = new Response();
try
{
App.Add(obj);
_app.Add(obj);
}
catch (Exception e)
{
@@ -113,13 +91,13 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(resp);
}
[System.Web.Mvc.HttpPost]
public string Update(Resource obj)
[HttpPost]
public string Update(AddOrUpdateResReq obj)
{
Response resp = new Response();
try
{
App.Update(obj);
_app.Update(obj);
}
catch (Exception e)
{
@@ -129,6 +107,5 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(resp);
}
}
}