diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj index b14a4433..97ca2bb9 100644 --- a/OpenAuth.App/OpenAuth.App.csproj +++ b/OpenAuth.App/OpenAuth.App.csproj @@ -105,6 +105,8 @@ + + diff --git a/OpenAuth.App/ResourceApp.cs b/OpenAuth.App/ResourceApp.cs index db4ddf6d..2e4eeed0 100644 --- a/OpenAuth.App/ResourceApp.cs +++ b/OpenAuth.App/ResourceApp.cs @@ -33,7 +33,7 @@ namespace OpenAuth.App } - public TableData All(QueryResourcesReq request) + public TableData Load(QueryResourcesReq request) { var result = new TableData(); var resources = UnitWork.Find(null) ; diff --git a/OpenAuth.App/Response/TableData.cs b/OpenAuth.App/Response/TableData.cs index 85c0b66a..3f88f7cb 100644 --- a/OpenAuth.App/Response/TableData.cs +++ b/OpenAuth.App/Response/TableData.cs @@ -1,23 +1,23 @@ -// *********************************************************************** -// Assembly : FundationAdmin -// Author : yubaolee -// Created : 03-09-2016 -// -// Last Modified By : yubaolee -// Last Modified On : 03-09-2016 -// *********************************************************************** -// -// 版权所有(C) Microsoft 2015 -// -// layui datatable数据返回 -// *********************************************************************** - -namespace OpenAuth.App.Response -{ - /// - /// table的返回数据 - /// - public class TableData +// *********************************************************************** +// Assembly : FundationAdmin +// Author : yubaolee +// Created : 03-09-2016 +// +// Last Modified By : yubaolee +// Last Modified On : 03-09-2016 +// *********************************************************************** +// +// 版权所有(C) Microsoft 2015 +// +// layui datatable数据返回 +// *********************************************************************** + +namespace OpenAuth.App.Response +{ + /// + /// table的返回数据 + /// + public class TableData { /// /// 状态码 @@ -26,16 +26,16 @@ namespace OpenAuth.App.Response /// /// 操作消息 /// - public string msg; - - /// - /// 总记录条数 - /// - public int count; - - /// - /// 数据内容 - /// - public dynamic data; - } + public string msg; + + /// + /// 总记录条数 + /// + public int count; + + /// + /// 数据内容 + /// + public dynamic data; + } } \ No newline at end of file diff --git a/OpenAuth.Mvc/Controllers/ResourcesController.cs b/OpenAuth.Mvc/Controllers/ResourcesController.cs index 3282c574..bc0cdcf2 100644 --- a/OpenAuth.Mvc/Controllers/ResourcesController.cs +++ b/OpenAuth.Mvc/Controllers/ResourcesController.cs @@ -20,11 +20,9 @@ namespace OpenAuth.Mvc.Controllers return View(); } - public string All([FromUri]QueryResourcesReq request) + public string Load([FromUri]QueryResourcesReq request) { - TableData data = new TableData(); - data = App.All(request); - return JsonHelper.Instance.Serialize(data); + return JsonHelper.Instance.Serialize(App.Load(request)); } [System.Web.Mvc.HttpPost] diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index 1bdf4008..c8bbb870 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -143,6 +143,7 @@ + diff --git a/OpenAuth.Mvc/Views/Categories/Index.cshtml b/OpenAuth.Mvc/Views/Categories/Index.cshtml index 849d8ea2..a696aca8 100644 --- a/OpenAuth.Mvc/Views/Categories/Index.cshtml +++ b/OpenAuth.Mvc/Views/Categories/Index.cshtml @@ -31,7 +31,7 @@ + public abstract class TreeEntity: Entity + { + /// + /// 父节点名称 + /// + public string ParentId { get; set; } + /// + /// 父节点名称 + /// + public string ParentName { get; set; } + + /// + /// 节点语义ID + /// + public string CascadeId { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + } + +} diff --git a/README.md b/README.md index a8bc21a1..8aac7a40 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,7 @@ `演示直达` -* 联通:http://113.204.18.84:1802 - -* 电信:http://222.178.90.18:1802 +* http://demo.openauth.me:1802 ####当前版本 @@ -34,7 +32,7 @@ * 前端采用 vue + layui + ztree + gooflow + leipiformdesign -* 后端采用 asp.net mvc + EF + autofac + swagger + json.net +* 后端采用 asp.net mvc + Web API + EF + autofac + swagger + json.net * 代码生成工具 CodeSmith