diff --git a/OpenAuth.App/ResourceApp.cs b/OpenAuth.App/ResourceApp.cs index 2e4eeed0..4108508e 100644 --- a/OpenAuth.App/ResourceApp.cs +++ b/OpenAuth.App/ResourceApp.cs @@ -12,6 +12,7 @@ namespace OpenAuth.App /// public class ResourceApp:BaseApp { + public RevelanceManagerApp RevelanceManagerApp { get; set; } public IEnumerable Get(string type) { @@ -32,6 +33,19 @@ namespace OpenAuth.App Repository.Update(u =>u.Id,resource); } + public IEnumerable LoadForUser(string appId, string userId) + { + var elementIds = RevelanceManagerApp.Get(Define.USERRESOURCE, true, userId); + return UnitWork.Find(u => elementIds.Contains(u.Id) && (appId == "" || u.AppId == appId)); + } + + public IEnumerable LoadForRole(string appId, string userId) + { + var elementIds = RevelanceManagerApp.Get(Define.ROLERESOURCE, true, userId); + return UnitWork.Find(u => elementIds.Contains(u.Id) && (appId =="" || u.AppId == appId)); + } + + public TableData Load(QueryResourcesReq request) { diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs index 642527ae..e84428bd 100644 --- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs @@ -28,9 +28,9 @@ namespace OpenAuth.Mvc.Controllers { return View(); } - + /// - /// 加载用户模块 + /// 加载特定用户的模块 /// /// The user identifier. /// System.String. diff --git a/OpenAuth.Mvc/Controllers/ResourcesController.cs b/OpenAuth.Mvc/Controllers/ResourcesController.cs index bc0cdcf2..bdda558b 100644 --- a/OpenAuth.Mvc/Controllers/ResourcesController.cs +++ b/OpenAuth.Mvc/Controllers/ResourcesController.cs @@ -1,10 +1,11 @@ using System; +using System.Collections.Generic; +using System.Linq; using System.Web.Http; using System.Web.Mvc; using Infrastructure; using OpenAuth.App; using OpenAuth.App.Request; -using OpenAuth.App.Response; using OpenAuth.Repository.Domain; namespace OpenAuth.Mvc.Controllers @@ -19,6 +20,61 @@ namespace OpenAuth.Mvc.Controllers { return View(); } + public ActionResult Assign() + { + return View(); + } + + /// + /// 加载特定用户的资源 + /// + /// 应用appId + /// 用户ID + /// System.String. + public string LoadForUser(string appId, string firstId) + { + + try + { + var result = new Response> + { + 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); + } + + /// + /// 加载角色资源 + /// + /// 应用ID + /// 角色ID + public string LoadForRole(string appId, string firstId) + { + try + { + var result = new Response> + { + 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; + } + + return JsonHelper.Instance.Serialize(Result); + } + public string Load([FromUri]QueryResourcesReq request) { diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index c8bbb870..e0d98480 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -201,6 +201,7 @@ + @@ -650,6 +651,7 @@ + diff --git a/OpenAuth.Mvc/Views/Resources/Assign.cshtml b/OpenAuth.Mvc/Views/Resources/Assign.cshtml new file mode 100644 index 00000000..e0e07277 --- /dev/null +++ b/OpenAuth.Mvc/Views/Resources/Assign.cshtml @@ -0,0 +1,31 @@ +@section header +{ + +} + + + + + + + + + + + + + + +
资源标识名称是否可用描述所属应用分类名称
+ + + + \ No newline at end of file diff --git a/OpenAuth.Mvc/Views/Resources/Index.cshtml b/OpenAuth.Mvc/Views/Resources/Index.cshtml index 27443cd7..7533b867 100644 --- a/OpenAuth.Mvc/Views/Resources/Index.cshtml +++ b/OpenAuth.Mvc/Views/Resources/Index.cshtml @@ -5,37 +5,45 @@
- - - - - - - - - - - - - -
资源标识名称当前状态排序号描述分类名称
- + + + + + + + + + + + + + + +
资源标识名称是否可用排序描述所属应用分类名称
+ + +