diff --git a/OpenAuth.App/CategoryManagerApp.cs b/OpenAuth.App/CategoryManagerApp.cs index e869f652..901ab982 100644 --- a/OpenAuth.App/CategoryManagerApp.cs +++ b/OpenAuth.App/CategoryManagerApp.cs @@ -50,8 +50,9 @@ namespace OpenAuth.App } else { - Categorys = _repository.LoadInOrgs(pageindex, pagesize, GetSubCategories(parentId)); - total = _repository.GetCategoryCntInOrgs(parentId); + var ids = GetSubCategories(parentId); + Categorys = _repository.LoadInOrgs(pageindex, pagesize, ids); + total = _repository.GetCategoryCntInOrgs(ids); } return new diff --git a/OpenAuth.App/ModuleManagerApp.cs b/OpenAuth.App/ModuleManagerApp.cs index 5f588e59..419ae6d7 100644 --- a/OpenAuth.App/ModuleManagerApp.cs +++ b/OpenAuth.App/ModuleManagerApp.cs @@ -34,8 +34,9 @@ namespace OpenAuth.App } else { - Modules = _repository.LoadInOrgs(pageindex, pagesize, GetSubOrgIds(parentId)); - total = _repository.GetModuleCntInOrgs(parentId); + var ids = GetSubOrgIds(parentId); + Modules = _repository.LoadInOrgs(pageindex, pagesize, ids); + total = _repository.GetModuleCntInOrgs(ids); } return new diff --git a/OpenAuth.App/UserManagerApp.cs b/OpenAuth.App/UserManagerApp.cs index 32a27162..fe9b1b44 100644 --- a/OpenAuth.App/UserManagerApp.cs +++ b/OpenAuth.App/UserManagerApp.cs @@ -49,8 +49,9 @@ namespace OpenAuth.App } else { - users = _repository.LoadInOrgs(pageindex, pagesize, GetSubOrgIds(orgId)); - total = _repository.GetUserCntInOrgs(orgId); + var ids = GetSubOrgIds(orgId); + users = _repository.LoadInOrgs(pageindex, pagesize, ids); + total = _repository.GetUserCntInOrgs(ids); } var userviews = new List(); foreach (var user in users) diff --git a/OpenAuth.Mvc/BllScripts/assignModuleElement.js b/OpenAuth.Mvc/BllScripts/assignModuleElement.js index ed9795a7..e14f8a52 100644 --- a/OpenAuth.Mvc/BllScripts/assignModuleElement.js +++ b/OpenAuth.Mvc/BllScripts/assignModuleElement.js @@ -1,17 +1,14 @@ // *********************************************************************** // Assembly : OpenAuth.Mvc // Author : yubaolee -// Created : 04-16-2016 +// Created : 04-19-2016 // // Last Modified By : yubaolee -// Last Modified On : 04-16-2016 +// Last Modified On : 05-26-2016 +// Contact : www.cnblogs.com/yubaolee +// File: assignModuleElement.js +//Description: 分配模块菜单(按钮) // *********************************************************************** -// -// 版权所有(C) 2015 -// -// 分配模块菜单(按钮) -// *********************************************************************** - $(document).ready(function () { $.CurrentDialog.find("#btnAccess").on("click", function () { diff --git a/OpenAuth.Mvc/BllScripts/assignOrg.js b/OpenAuth.Mvc/BllScripts/assignOrg.js index 5b61c0bb..b379a715 100644 --- a/OpenAuth.Mvc/BllScripts/assignOrg.js +++ b/OpenAuth.Mvc/BllScripts/assignOrg.js @@ -97,7 +97,7 @@ var ztree = function () { event.preventDefault(); } - $.getJSON('/OrgManager/LoadForTree', function (json) { + $.getJSON('/OrgManager/LoadOrg', function (json) { zTreeObj = $.fn.zTree.init($.CurrentDialog.find("#tree"), setting, json); zTreeObj.expandAll(true); }); diff --git a/OpenAuth.Mvc/BllScripts/orgManager.js b/OpenAuth.Mvc/BllScripts/orgManager.js index c63c2379..cdad44a5 100644 --- a/OpenAuth.Mvc/BllScripts/orgManager.js +++ b/OpenAuth.Mvc/BllScripts/orgManager.js @@ -1,4 +1,46 @@ - +//左边分类导航树 +var ztree = function () { + var url = '/OrgManager/LoadOrg'; + var setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { + onClick: function (event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } + }; + var load = function () { + $.getJSON(url, function (json) { + var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); + var firstId; //tree的第一个ID + if (json.length > 0) { + firstId = json[0].Id; + } else { + firstId = -1; + } + list.reload(firstId); + zTreeObj.expandAll(true); + }); + }; + load(); + + return { + reload: load + } +}(); + //grid列表模块 function MainGrid() { var url = '/OrgManager/LoadChildren?Id='; @@ -57,7 +99,7 @@ function MainGrid() { align: 'center' }, ], - dataUrl: url + selectedId, + data: [], fullGrid: true, showLinenumber: true, showCheckboxcol: true, @@ -74,41 +116,6 @@ function MainGrid() { MainGrid.prototype = new Grid(); var list = new MainGrid(); -//左边分类导航树 -var ztree = function () { - var url = '/OrgManager/LoadOrg'; - var setting = { - view: { selectedMulti: false }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { onClick: zTreeOnClick } - }; - $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); - }); - function zTreeOnClick(event, treeId, treeNode) { - list.reload(treeNode.Id); - } - - return { - reload: function () { - $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); - }); - } - } -}(); - //编辑时,选择上级弹出的树 var parentTree = function () { var nameDom = "#ParentName"; @@ -156,7 +163,7 @@ var parentTree = function () { return { show: function () { - $.getJSON('/OrgManager/LoadForTree', function (json) { + $.getJSON('/OrgManager/LoadOrg', function (json) { zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json); var orgstr = $(idDom).val(); var name = ''; diff --git a/OpenAuth.Mvc/BllScripts/roleManager.js b/OpenAuth.Mvc/BllScripts/roleManager.js index 56fc0847..15a2f6d5 100644 --- a/OpenAuth.Mvc/BllScripts/roleManager.js +++ b/OpenAuth.Mvc/BllScripts/roleManager.js @@ -1,4 +1,46 @@ - +//左边分类导航树 +var orgtree = function () { + var url = '/OrgManager/LoadOrg'; + var setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { + onClick: function (event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } + }; + var load = function () { + $.getJSON(url, function (json) { + var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); + var firstId; //tree的第一个ID + if (json.length > 0) { + firstId = json[0].Id; + } else { + firstId = -1; + } + list.reload(firstId); + zTreeObj.expandAll(true); + }); + }; + load(); + + return { + reload: load + } +}(); + //grid列表模块 function MainGrid() { var url = '/RoleManager/Load?orgId='; @@ -39,7 +81,7 @@ function MainGrid() { width: 100 }, ], - dataUrl: url + selectedId, + data:[], fullGrid: true, showLinenumber: true, showCheckboxcol: true, @@ -56,41 +98,6 @@ function MainGrid() { MainGrid.prototype = new Grid(); var list = new MainGrid(); -//左边分类导航树 -var orgtree = function () { - var url = '/OrgManager/LoadOrg'; - var setting = { - view: { selectedMulti: false }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { onClick: zTreeOnClick } - }; - $.getJSON(url, function (json) { - $.fn.zTree.init($("#orgtree"), setting, json).expandAll(true); - }); - function zTreeOnClick(event, treeId, treeNode) { - list.reload(treeNode.Id); - } - - return { - reload: function () { - $.getJSON(url, function (json) { - $.fn.zTree.init($("#orgtree"), setting, json).expandAll(true); - }); - } - } -}(); - //编辑时,选择上级弹出的树 var parentTree = function () { var nameDom = "#OrgName"; @@ -138,7 +145,7 @@ var parentTree = function () { return { show: function () { - $.getJSON('/OrgManager/LoadForTree', function (json) { + $.getJSON('/OrgManager/LoadOrg', function (json) { zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json); var orgstr = $(idDom).val(); var name = ''; diff --git a/OpenAuth.Mvc/BllScripts/stockManager.js b/OpenAuth.Mvc/BllScripts/stockManager.js index 2355b429..0cb69fa4 100644 --- a/OpenAuth.Mvc/BllScripts/stockManager.js +++ b/OpenAuth.Mvc/BllScripts/stockManager.js @@ -1,4 +1,45 @@ - +//左边分类导航树 +var tree = function () { + var url = '/OrgManager/LoadOrg'; + var setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { + onClick: function (event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } + }; + var load = function () { + $.getJSON(url, function (json) { + var zTreeObj = $.fn.zTree.init($("#tree"), setting, json); + var firstId; //tree的第一个ID + if (json.length > 0) { + firstId = json[0].Id; + } else { + firstId = -1; + } + list.reload(firstId); + zTreeObj.expandAll(true); + }); + }; + load(); + + return { + reload: load + } +}(); //grid列表模块 function MainGrid() { var url = '/StockManager/Load?parentId='; @@ -53,7 +94,7 @@ function MainGrid() { width: 100 }, ], - dataUrl: url + selectedId, + data:[], fullGrid: true, showLinenumber: true, showCheckboxcol: true, @@ -70,41 +111,6 @@ function MainGrid() { MainGrid.prototype = new Grid(); var list = new MainGrid(); -//左边分类导航树 -var ztree = function () { - var url = '/OrgManager/LoadOrg'; - var setting = { - view: { selectedMulti: false }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { onClick: zTreeOnClick } - }; - $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); - }); - function zTreeOnClick(event, treeId, treeNode) { - list.reload(treeNode.Id); - } - - return { - reload: function () { - $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); - }); - } - } -}(); - //编辑时,选择上级弹出的树 var parentTree = function () { var nameDom = "#ParentName"; @@ -152,7 +158,7 @@ var parentTree = function () { return { show: function () { - $.getJSON('/OrgManager/LoadForTree', function (json) { + $.getJSON('/OrgManager/LoadOrg', function (json) { zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json); var orgstr = $(idDom).val(); var name = ''; diff --git a/OpenAuth.Mvc/BllScripts/userRoleManager.js b/OpenAuth.Mvc/BllScripts/userRoleManager.js index 99e80f75..c0ac3fa7 100644 --- a/OpenAuth.Mvc/BllScripts/userRoleManager.js +++ b/OpenAuth.Mvc/BllScripts/userRoleManager.js @@ -70,7 +70,7 @@ function UserRolesList() { width: 100 } ], - dataUrl: '/RoleManager/LoadForOrgAndUser?orgId=' + selectedId + '&userId=' + $('#userId').val(), + data:[], fullGrid: true, showLinenumber: true, showCheckboxcol: true, @@ -105,8 +105,16 @@ var ztree = function () { callback: { onClick: zTreeOnClick } }; $.getJSON('/OrgManager/LoadOrg', function (json) { - var zTreeObj = $.fn.zTree.init($.CurrentDialog.find("#tree"), setting, json); + var zTreeObj = $.fn.zTree.init($("#tree"), setting, json); + var firstId; //tree的第一个ID + if (json.length > 0) { + firstId = json[0].Id; + } else { + firstId = -1; + } + userRolesList.reload(firstId); zTreeObj.expandAll(true); + }); }(); function zTreeOnClick(event, treeId, treeNode) { diff --git a/OpenAuth.Mvc/BllScripts/usermanager.js b/OpenAuth.Mvc/BllScripts/usermanager.js index 38f8f065..83af56b7 100644 --- a/OpenAuth.Mvc/BllScripts/usermanager.js +++ b/OpenAuth.Mvc/BllScripts/usermanager.js @@ -1,4 +1,46 @@ - +//左边分类导航树 +var maintree = function () { + var url = '/OrgManager/LoadOrg'; + var setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { + onClick: function (event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } + }; + var load = function () { + $.getJSON(url, function (json) { + var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); + var firstId; //tree的第一个ID + if (json.length > 0) { + firstId = json[0].Id; + } else { + firstId = -1; + } + list.reload(firstId); + zTreeObj.expandAll(true); + }); + }; + load(); + + return { + reload: load + } +}(); + //grid列表模块 function MainGrid() { var url = '/UserManager/Load?orgId='; @@ -47,7 +89,7 @@ function MainGrid() { } ], - dataUrl: url + selectedId, + data:[], fullGrid: true, showLinenumber: true, showCheckboxcol: true, @@ -56,6 +98,7 @@ function MainGrid() { showTfoot: false, }); + this.reload = function (id) { if (id != undefined) selectedId = id; this.maingrid.datagrid('reload', { dataUrl: url + selectedId }); @@ -64,42 +107,6 @@ function MainGrid() { MainGrid.prototype = new Grid(); var list = new MainGrid(); -//左边分类导航树 -var maintree = function () { - var url = '/OrgManager/LoadOrg'; - var setting = { - view: { selectedMulti: false }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { - onClick: function(event, treeId, treeNode) { - list.reload(treeNode.Id); - } - } - }; - $.getJSON(url, function (json) { - $.fn.zTree.init($("#orgtree"), setting, json).expandAll(true); - }); - - return { - reload: function () { - $.getJSON(url, function (json) { - $.fn.zTree.init($("#orgtree"), setting, json).expandAll(true); - }); - } - } -}(); - //编辑时,选择上级弹出的树 var parentTree = function () { var nameDom = "#Organizations"; diff --git a/OpenAuth.Mvc/Controllers/BaseController.cs b/OpenAuth.Mvc/Controllers/BaseController.cs index 997b7c5d..e25ccd45 100644 --- a/OpenAuth.Mvc/Controllers/BaseController.cs +++ b/OpenAuth.Mvc/Controllers/BaseController.cs @@ -46,10 +46,10 @@ namespace OpenAuth.Mvc.Controllers if (function == null) throw new Exception("未能找到Action"); - var anonymous = function.GetCustomAttribute(typeof(AnonymousAttribute)); + var authorize = function.GetCustomAttribute(typeof(AuthenticateAttribute)); var module = loginUser.Modules.FirstOrDefault(u => u.Url.ToLower().Contains(controllername)); //当前登录用户没有Action记录&&Action没有anonymous标识 - if (module == null && anonymous == null) + if (authorize != null && module == null) { filterContext.Result = new RedirectResult("/Login/Index"); return; diff --git a/OpenAuth.Mvc/Controllers/CategoryManagerController.cs b/OpenAuth.Mvc/Controllers/CategoryManagerController.cs index 50e2a361..bc3180ae 100644 --- a/OpenAuth.Mvc/Controllers/CategoryManagerController.cs +++ b/OpenAuth.Mvc/Controllers/CategoryManagerController.cs @@ -4,6 +4,7 @@ using System.Web.Mvc; using Infrastructure; using OpenAuth.App; using OpenAuth.Domain; +using OpenAuth.Mvc.Models; namespace OpenAuth.Mvc.Controllers { @@ -18,6 +19,7 @@ namespace OpenAuth.Mvc.Controllers // // GET: /UserManager/ + [Authenticate] public ActionResult Index() { return View(); @@ -33,16 +35,7 @@ namespace OpenAuth.Mvc.Controllers public string LoadForTree() { - var models = _app.LoadAll(); - //添加根节点 - models.Add(new Category - { - Id = 0, - ParentId = -1, - Name = "根结点", - CascadeId = "0" - }); - return JsonHelper.Instance.Serialize(models); + return JsonHelper.Instance.Serialize(_app.LoadAll()); } //添加或修改Category diff --git a/OpenAuth.Mvc/Controllers/HomeController.cs b/OpenAuth.Mvc/Controllers/HomeController.cs index 24df80dd..e84adebf 100644 --- a/OpenAuth.Mvc/Controllers/HomeController.cs +++ b/OpenAuth.Mvc/Controllers/HomeController.cs @@ -16,26 +16,22 @@ namespace OpenAuth.Mvc.Controllers _app = AutofacExt.GetFromFac(); } - [Anonymous] public string GetModules(int parentId = 0) { return JsonHelper.Instance.Serialize(_app.LoadByParent(parentId)); } - [Anonymous] public ActionResult Index() { var user = AutofacExt.GetFromFac().GetLoginUser(); return View(user.Modules); } - [Anonymous] public ActionResult Main() { return View(); } - [Anonymous] public ActionResult Git() { return View(); @@ -46,7 +42,6 @@ namespace OpenAuth.Mvc.Controllers /// /// ActionResult. [ChildActionOnly] - [Anonymous] public ActionResult MenuHeader() { return View(); diff --git a/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs index 3eb21f35..3bd904f9 100644 --- a/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs @@ -31,18 +31,15 @@ namespace OpenAuth.Mvc.Controllers { _app = AutofacExt.GetFromFac(); } - [Anonymous] public ActionResult Index(int id) { ViewBag.ModuleId = id; return View(); } - [Anonymous] public ActionResult Get(int moduleId = 0) { return Json(_app.LoadByModuleId(moduleId)); } - [Anonymous] [HttpPost] public string AddOrEditButton(ModuleElement button) { @@ -57,7 +54,6 @@ namespace OpenAuth.Mvc.Controllers } return JsonHelper.Instance.Serialize(_bjuiResponse); } - [Anonymous] public string Del(string moduleElements) { try @@ -80,14 +76,12 @@ namespace OpenAuth.Mvc.Controllers /// The first identifier. /// The key. /// ActionResult. - [Anonymous] public ActionResult AssignModuleElement(int firstId, string key) { ViewBag.FirstId = firstId; ViewBag.ModuleType = key; return View(); } - [Anonymous] public string LoadWithAccess(int tId, int firstId, string key) { return JsonHelper.Instance.Serialize(_app.LoadWithAccess(key, firstId, tId)); diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs index 529002b8..65c50e19 100644 --- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Web.Mvc; using Infrastructure.Helper; using OpenAuth.App.ViewModel; +using OpenAuth.Mvc.Models; namespace OpenAuth.Mvc.Controllers { @@ -18,8 +19,8 @@ namespace OpenAuth.Mvc.Controllers _app = AutofacExt.GetFromFac(); } - // // GET: /ModuleManager/ + [Authenticate] public ActionResult Index() { return View(); @@ -52,14 +53,6 @@ namespace OpenAuth.Mvc.Controllers public string LoadModuleWithRoot() { var orgs = AutofacExt.GetFromFac().GetLoginUser().Modules.MapToList(); - //添加根节点 - orgs.Add(new Module - { - Id = 0, - ParentId = -1, - Name = "根节点", - CascadeId = "0" - }); return JsonHelper.Instance.Serialize(orgs); } diff --git a/OpenAuth.Mvc/Controllers/OrgManagerController.cs b/OpenAuth.Mvc/Controllers/OrgManagerController.cs index 5c5b86b6..8e4f23ac 100644 --- a/OpenAuth.Mvc/Controllers/OrgManagerController.cs +++ b/OpenAuth.Mvc/Controllers/OrgManagerController.cs @@ -22,11 +22,11 @@ namespace OpenAuth.Mvc.Controllers // // GET: /OrgManager/ + [Authenticate] public ActionResult Index() { return View(); } - public ActionResult Assign(int firstId, string key) { ViewBag.FirstId = firstId; @@ -34,40 +34,14 @@ namespace OpenAuth.Mvc.Controllers return View(); } - /// - /// 返回当前登录用户可访问到的部门 - /// - /// System.String. - public string LoadForTree() - { - var orgs = AutofacExt.GetFromFac().GetLoginUser().AccessedOrgs; - return JsonHelper.Instance.Serialize(orgs); - } - /// - /// 返回带有根节点的全部部门,不受用户权限影响 - /// 可以匿名访问 - /// - /// System.String. - [Anonymous] public string LoadOrg() { - var orgs = AutofacExt.GetFromFac().GetLoginUser().AccessedOrgs.MapToList(); - //添加根节点 - orgs.Add(new Org - { - Id = 0, - ParentId = -1, - Name = "根结点", - CascadeId = "0" - }); - return JsonHelper.Instance.Serialize(orgs); + return JsonHelper.Instance.Serialize(AutofacExt.GetFromFac().GetLoginUser().AccessedOrgs); } public string LoadForUser(int firstId) { var orgs = _orgApp.LoadForUser(firstId); - //添加根节点 - return JsonHelper.Instance.Serialize(orgs); } diff --git a/OpenAuth.Mvc/Controllers/RelevanceManagerController.cs b/OpenAuth.Mvc/Controllers/RelevanceManagerController.cs index 70834ad0..c7928679 100644 --- a/OpenAuth.Mvc/Controllers/RelevanceManagerController.cs +++ b/OpenAuth.Mvc/Controllers/RelevanceManagerController.cs @@ -20,7 +20,6 @@ namespace OpenAuth.Mvc.Controllers } [HttpPost] - [Anonymous] public string Assign(string type, int firstId, string secIds) { try @@ -36,7 +35,6 @@ namespace OpenAuth.Mvc.Controllers return JsonHelper.Instance.Serialize(BjuiResponse); } [HttpPost] - [Anonymous] public string UnAssign(string type, int firstId, string secIds) { try diff --git a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs index 1519c6c8..5b0f4e47 100644 --- a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs @@ -4,6 +4,7 @@ using OpenAuth.Domain; using System; using System.Linq; using System.Web.Mvc; +using OpenAuth.Mvc.Models; namespace OpenAuth.Mvc.Controllers { @@ -18,6 +19,7 @@ namespace OpenAuth.Mvc.Controllers // // GET: /UserManager/ + [Authenticate] public ActionResult Index() { return View(); @@ -50,14 +52,6 @@ namespace OpenAuth.Mvc.Controllers public string LoadForTree() { var models = _app.LoadAll(); - //添加根节点 - models.Add(new Resource - { - Id = 0, - ParentId = -1, - Name = "根结点", - CascadeId = "0" - }); return JsonHelper.Instance.Serialize(models); } diff --git a/OpenAuth.Mvc/Controllers/RoleManagerController.cs b/OpenAuth.Mvc/Controllers/RoleManagerController.cs index 197cc1f2..63882316 100644 --- a/OpenAuth.Mvc/Controllers/RoleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/RoleManagerController.cs @@ -4,6 +4,7 @@ using OpenAuth.Domain; using System; using System.Linq; using System.Web.Mvc; +using OpenAuth.Mvc.Models; namespace OpenAuth.Mvc.Controllers { @@ -18,6 +19,7 @@ namespace OpenAuth.Mvc.Controllers // // GET: /RoleManager/ + [Authenticate] public ActionResult Index() { return View(); @@ -66,7 +68,6 @@ namespace OpenAuth.Mvc.Controllers } #region 为用户设置角色界面 - public ActionResult LookupMulti(int userId) { ViewBag.UserId = userId; diff --git a/OpenAuth.Mvc/Controllers/StockManagerController.cs b/OpenAuth.Mvc/Controllers/StockManagerController.cs index 5f72b983..e75999ef 100644 --- a/OpenAuth.Mvc/Controllers/StockManagerController.cs +++ b/OpenAuth.Mvc/Controllers/StockManagerController.cs @@ -3,6 +3,7 @@ using OpenAuth.App; using OpenAuth.Domain; using System; using System.Web.Mvc; +using OpenAuth.Mvc.Models; namespace OpenAuth.Mvc.Controllers { @@ -21,6 +22,7 @@ namespace OpenAuth.Mvc.Controllers // // GET: /UserManager/ + [Authenticate] public ActionResult Index() { return View(); diff --git a/OpenAuth.Mvc/Controllers/UserManagerController.cs b/OpenAuth.Mvc/Controllers/UserManagerController.cs index f7b2a930..98fea31c 100644 --- a/OpenAuth.Mvc/Controllers/UserManagerController.cs +++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs @@ -4,6 +4,7 @@ using System.Web.Mvc; using Infrastructure; using OpenAuth.App; using OpenAuth.App.ViewModel; +using OpenAuth.Mvc.Models; namespace OpenAuth.Mvc.Controllers { @@ -18,6 +19,7 @@ namespace OpenAuth.Mvc.Controllers // // GET: /UserManager/ + [Authenticate] public ActionResult Index() { return View(); diff --git a/OpenAuth.Mvc/Models/AnonymousAttribute.cs b/OpenAuth.Mvc/Models/AuthenticateAttribute.cs similarity index 67% rename from OpenAuth.Mvc/Models/AnonymousAttribute.cs rename to OpenAuth.Mvc/Models/AuthenticateAttribute.cs index 7358bfa4..3a5b1a25 100644 --- a/OpenAuth.Mvc/Models/AnonymousAttribute.cs +++ b/OpenAuth.Mvc/Models/AuthenticateAttribute.cs @@ -5,10 +5,12 @@ using System.Web; namespace OpenAuth.Mvc.Models { + /// - /// 允许匿名访问 + /// 必须认证 /// - public class AnonymousAttribute :Attribute + public class AuthenticateAttribute : Attribute { + } } \ No newline at end of file diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index da6385f4..cc70a583 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -146,7 +146,7 @@ Global.asax - + diff --git a/OpenAuth.Repository/OrgRepository.cs b/OpenAuth.Repository/OrgRepository.cs index bed1c0b8..e679fef1 100644 --- a/OpenAuth.Repository/OrgRepository.cs +++ b/OpenAuth.Repository/OrgRepository.cs @@ -36,7 +36,7 @@ namespace OpenAuth.Repository cascadeId = org.CascadeId; } - return Find(u => u.CascadeId.Contains(cascadeId) && u.Id != orgId); + return Find(u => u.CascadeId.Contains(cascadeId)); } public IEnumerable GetSubWithOwn(int orgId)