lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-07-15 23:13:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.0 beta版

Browse Source 
1 完成进出库实例Stock；
2 全面实现组织数据分离，参考Stock实例；
3 全新的基于CodeSmith EF生成机制；
4 全面完成菜单授权;
5 增加Anonymous机制，可以灵活控制Action是否需要权限控制;
This commit is contained in:
yubaolee 2016-01-08 12:53:48 +08:00
parent 5317e07ae5
commit ab3fc27301
17 changed files with 139 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CodeSmith/Controller.cst
View File

@ -71,9 +71,9 @@ namespace OpenAuth.Mvc.Controllers
/// <summary>
/// 加载节点下面的所有<%=ModuleName %>s
/// </summary>
public string Load(int parentidId, int pageCurrent = 1, int pageSize = 30)
public string Load(int parentId, int pageCurrent = 1, int pageSize = 30)
{
return JsonHelper.Instance.Serialize(_app.Load(parentidId, pageCurrent, pageSize));
return JsonHelper.Instance.Serialize(_app.Load(parentId, pageCurrent, pageSize));
}
public string LoadForTree()

5
OpenAuth.App/LoginApp.cs
View File

@ -80,7 +80,7 @@ namespace OpenAuth.App
var orgids = _relevanceRepository.Find(
u =>
(u.FirstId == user.Id && u.Key == "UserAccessedOrg") ||
(u.Key == "RoleAccessdOrg" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
(u.Key == "RoleAccessedOrg" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
loginVM.AccessedOrgs = _orgRepository.Find(u => orgids.Contains(u.Id)).ToList();
return loginVM;
@ -95,7 +95,8 @@ namespace OpenAuth.App
{
User = new User
{
Name = "开发者账号"
Name = "开发者账号",
Account = "System"
}
};
loginUser.Modules = _moduleRepository.Find(null).MapToList<ModuleView>();

4
OpenAuth.App/ModuleElementManagerApp.cs
View File

@ -98,14 +98,14 @@ namespace OpenAuth.App
public void AssignForRole(int roleId,int moduleId, int[] menuIds)
{
var elements = _repository.Find(u => u.ModuleId == moduleId).Select(u =>u.Id);
var elements = _repository.Find(u => u.ModuleId == moduleId).Select(u =>u.Id).ToArray();
_relevanceRepository.Delete(u =>elements.Contains(u.SecondId) &&u.Key =="RoleElement" && u.FirstId == roleId);
_relevanceRepository.AddRelevance("RoleElement", menuIds.ToLookup(u => roleId));
}
public void AssignForUser(int userId, int moduleId, int[] ids)
{
var elements = _repository.Find(u => u.ModuleId == moduleId).Select(u => u.Id);
var elements = _repository.Find(u => u.ModuleId == moduleId).Select(u => u.Id).ToArray();
_relevanceRepository.Delete(u => elements.Contains(u.SecondId) && u.Key == "UserElement" && u.FirstId == userId);
_relevanceRepository.AddRelevance("UserElement", ids.ToLookup(u => userId));
}

11
OpenAuth.App/OrgManagerApp.cs
View File

@ -39,16 +39,7 @@ namespace OpenAuth.App
/// </summary>
public IList<Org> LoadAllChildren(int orgId)
{
string cascadeId = "0.";
if (orgId != 0)
{
var org = _repository.FindSingle(u => u.Id == orgId);
if (org == null)
throw new Exception("未能找到指定对象信息");
cascadeId = org.CascadeId;
}
return _repository.Find(u => u.CascadeId.Contains(cascadeId) && u.Id != orgId).ToList();
return _repository.GetSubOrgs(orgId).ToList();
}
/// <summary>

60
OpenAuth.App/StockManagerApp.cs
View File

@ -1,10 +1,11 @@

using OpenAuth.Domain;
using OpenAuth.Domain.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using Infrastructure;
using Infrastructure.Helper;
using OpenAuth.App.ViewModel;
namespace OpenAuth.App
{
@ -20,39 +21,38 @@ namespace OpenAuth.App
_orgRepository = orgRepository;
}
public int GetStockCntInOrg(int orgId)
{
if (orgId == 0)
{
return _repository.Find(null).Count();
}
else
{
return _repository.GetStockCntInOrgs(GetSubOrgIds(orgId));
}
}
public List<Stock> LoadAll()
{
return _repository.Find(null).ToList();
}
/// <summary>
/// 加载一个节点下面的一个或全部Stocks
/// 根据部门ID得到进出库信息
/// </summary>
public dynamic Load(int orgId, int pageindex, int pagesize)
{
IEnumerable<Stock> Stocks;
int total = 0;
var user = SessionHelper.GetSessionUser<LoginUserVM>();
var loginOrgs = user.AccessedOrgs.Select(u => u.Id).ToArray();
int total;
if (orgId == 0)
{
Stocks = _repository.LoadStocks(pageindex, pagesize);
total = _repository.GetCount();
if (loginOrgs.Length == 0) //改用户没有任何可见机构
{
Stocks = _repository.Find(pageindex, pagesize, "", u => u.User == user.User.Account);
total = _repository.GetCount(u =>u.User ==user.User.Account);
}
else
{
Stocks = _repository.LoadInOrgs(pageindex, pagesize, loginOrgs);
total = _repository.GetStockCntInOrgs(loginOrgs);
}
}
else
else //加载选择的机构及用户可访问的所有子机构
{
Stocks = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(orgId));
total = _repository.GetStockCntInOrgs(orgId);
var orgs = _orgRepository.GetSubOrgs(orgId).Where(u =>loginOrgs.Contains(u.Id));
List<int> orgIds = orgs.Select(u => u.Id).ToList();
orgIds.Add(orgId);
Stocks = _repository.LoadInOrgs(pageindex, pagesize, orgIds.ToArray());
total = _repository.GetStockCntInOrgs(orgIds.ToArray());
}
return new
@ -63,16 +63,6 @@ namespace OpenAuth.App
};
}
/// <summary>
/// 获取当前节点的所有下级节点
/// </summary>
private int[] GetSubOrgIds(int orgId)
{
var org = _orgRepository.FindSingle(u => u.Id == orgId);
var orgs = _orgRepository.Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray();
return orgs;
}
public Stock Find(int id)
{
var stock = _repository.FindSingle(u => u.Id == id);

6
OpenAuth.Domain/Interface/IOrgRepository.cs
View File

@ -11,5 +11,11 @@ namespace OpenAuth.Domain.Interface
IEnumerable<Org> LoadOrgs();
IEnumerable<Org> LoadByUser(int userId);
/// <summary>
/// 得到全部子部门
/// </summary>
/// <param name="orgId">部门ID</param>
IEnumerable<Org> GetSubOrgs(int orgId);
}
}

11
OpenAuth.Mvc/Controllers/BaseController.cs
View File

@ -15,7 +15,9 @@
using Infrastructure.Helper;
using OpenAuth.App.ViewModel;
using OpenAuth.Mvc.Models;
using System;
using System.Linq;
using System.Reflection;
using System.Web.Mvc;
namespace OpenAuth.Mvc.Controllers
@ -36,8 +38,15 @@ namespace OpenAuth.Mvc.Controllers
if (controllername != "home") //主页控制器无需权限控制
{
var actionname = Request.RequestContext.RouteData.Values["action"].ToString();
var function = this.GetType().GetMethods().FirstOrDefault(u => u.Name == actionname);
if (function == null)
throw new Exception("未能找到Action");
var anonymous = function.GetCustomAttribute(typeof(AnonymousAttribute));
var module = loginUser.Modules.FirstOrDefault(u => u.Url.ToLower().Contains(controllername));
if (module == null)
if (module == null && anonymous == null)
{
filterContext.Result = new RedirectResult("/Login/Index");
return;

1
OpenAuth.Mvc/Controllers/OrgManagerController.cs
View File

@ -60,6 +60,7 @@ namespace OpenAuth.Mvc.Controllers
var orgs = SessionHelper.GetSessionUser<LoginUserVM>().AccessedOrgs;
return JsonHelper.Instance.Serialize(orgs);
}
[Anonymous]
public string LoadOrg()
{
var orgs = SessionHelper.GetSessionUser<LoginUserVM>().AccessedOrgs.MapToList<Org>();

24
OpenAuth.Mvc/Controllers/StockManagerController.cs
View File

@ -3,6 +3,8 @@ using OpenAuth.App;
using OpenAuth.Domain;
using System;
using System.Web.Mvc;
using Infrastructure.Helper;
using OpenAuth.App.ViewModel;
namespace OpenAuth.Mvc.Controllers
{
@ -33,7 +35,10 @@ namespace OpenAuth.Mvc.Controllers
{
try
{
_app.AddOrUpdate(model);
var newmodel = new Stock();
model.CopyTo(newmodel);
newmodel.User = SessionHelper.GetSessionUser<LoginUserVM>().User.Account;
_app.AddOrUpdate(newmodel);
}
catch (Exception ex)
{
@ -46,22 +51,9 @@ namespace OpenAuth.Mvc.Controllers
/// <summary>
/// 加载节点下面的所有Stocks
/// </summary>
public string Load(int parentidId, int pageCurrent = 1, int pageSize = 30)
public string Load(int parentId, int pageCurrent = 1, int pageSize = 30)
{
return JsonHelper.Instance.Serialize(_app.Load(parentidId, pageCurrent, pageSize));
}
public string LoadForTree()
{
var models = _app.LoadAll();
//添加根节点
models.Add(new Stock
{
Id = 0,
OrgId = -1,
Name = "根结点",
});
return JsonHelper.Instance.Serialize(models);
return JsonHelper.Instance.Serialize(_app.Load(parentId, pageCurrent, pageSize));
}
public string Delete(int Id)

14
OpenAuth.Mvc/Models/AnonymousAttribute.cs Normal file
View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace OpenAuth.Mvc.Models
{
/// <summary>
/// 允许匿名访问
/// </summary>
public class AnonymousAttribute :Attribute
{
}
}

1
OpenAuth.Mvc/OpenAuth.Mvc.csproj
View File

@ -137,6 +137,7 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Models\AnonymousAttribute.cs" />
<Compile Include="Models\BJUIResponse.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

8
OpenAuth.Mvc/Properties/AssemblyInfo.cs
View File

@ -5,13 +5,13 @@ using System.Runtime.InteropServices;
// 有关程序集的常规信息是通过以下项进行控制的
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("OpenAuth.Mvc")]
[assembly: AssemblyTitle("基于DDDLite的权限管理系统")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("www.cnblogs.com/yubaolee")]
[assembly: AssemblyProduct("OpenAuth.Mvc")]
[assembly: AssemblyCopyright("版权所有(C) 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCopyright("版权所有(C) 2015")]
[assembly: AssemblyTrademark("OpenAuth.Net")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 将使此程序集中的类型

16
OpenAuth.Mvc/Views/StockManager/Add.cshtml
View File

@ -40,13 +40,7 @@
data-rule="required" size="20">
</td>
</tr>
<tr>
<td>
<label for="User" class="control-label x120">：</label>
<input type="text" name="User" id="User" value="@Model.User"
data-rule="required" size="20">
</td>
</tr>
<tr>
<td>
<label for="Time" class="control-label x120">操作时间：</label>
@ -59,9 +53,9 @@
@Html.HiddenFor(m =>m.OrgId)
@if (Model.Id == 0) //添加
{
//这个只用于显示使用，并不会进行提交处理，真正提交的是cascadeId
<label for="CascadeName" class="control-label x120">父节点流水号：</label>
<input type="text" name="CascadeName" id="CascadeName"
//这个只用于显示使用，并不会进行提交处理，真正提交的是OrgId
<label for="OrgName" class="control-label x120">所属部门：</label>
<input type="text" name="OrgName" id="OrgName"
data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="">
<ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul>
<script type="text/javascript">
@ -95,7 +89,7 @@
onCheck: zTreeCheck
}
};
$.getJSON('CategoryManager/LoadForTree', function (json) {
$.getJSON('OrgManager/LoadForTree', function (json) {
var zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
zTreeObj.expandAll(true);
});

84
OpenAuth.Mvc/Views/StockManager/Index.cshtml
View File

@ -17,7 +17,6 @@
</div>
</div>
<script type="text/javascript">
var selectedId = 0;
$(document).ready(function () {
@ -33,59 +32,54 @@
$('#@_gridId').datagrid({
showToolbar: false,
filterThead: false,
columns: [
{
columns: [
{
name: 'Id',
label: '数据ID',
width: 100
, hide: true
},
{
width: 100,
hide: true
},
{
name: 'Name',
label: '产品名称',
width: 100
},
{
width: 100
},
{
name: 'Number',
label: '产品数量',
width: 100
,type: 'select',
align: 'center',
items: [{ '0': '默认' }, { '1': '状态1' }],
},
{
width: 100
},
{
name: 'Price',
label: '产品单价',
width: 100
},
{
width: 100
},
{
name: 'Status',
label: '出库/入库',
width: 100
,type: 'select',
width: 100
, type: 'select',
align: 'center',
items: [{ '0': '默认' }, { '1': '状态1' }],
},
{
items: [{ '0': '入库' }, { '1': '出库' }],
},
{
name: 'User',
label: '',
width: 100
},
{
label: '操作人',
width: 100
},
{
name: 'Time',
label: '操作时间',
width: 100
, type: 'date',
width: 100
, type: 'date',
pattern: 'yyyy-MM-dd HH:mm:ss'
},
{
},
{
name: 'OrgId',
label: '组织ID',
width: 100
,type: 'select',
align: 'center',
items: [{ '0': '默认' }, { '1': '状态1' }],
},
label: '所属部门',
width: 100,
hide: true
}
],
dataUrl: 'StockManager/Load?parentId=' + selectedId,
fullGrid: true,
@ -105,7 +99,7 @@
function initZtree() {
var setting = {
view: {selectedMulti: false},
view: { selectedMulti: false },
data: {
key: {
name: 'Name',
@ -118,9 +112,9 @@
rootPId: 'null'
}
},
callback: {onClick: zTreeOnClick}
callback: { onClick: zTreeOnClick }
};
$.getJSON('StockManager/LoadForTree', function (json) {
$.getJSON('OrgManager/LoadOrg', function (json) {
var zTreeObj = $.fn.zTree.init($('#@_treeId'), setting, json);
zTreeObj.expandAll(true);
});
@ -128,7 +122,7 @@
//删除
function delStock() {
var selected = getSelected('#@_gridId',2);
var selected = getSelected('#@_gridId', 2);
if (selected == null) return;
$.getJSON('StockManager/Delete?Id=' + selected, function (data) {
@ -142,14 +136,14 @@
//自定义的编辑按钮
function editStock() {
var selected = getSelected('#@_gridId',2);
var selected = getSelected('#@_gridId', 2);
if (selected == null) return;
$(this).dialog({
id: 'editDialog',
url: '/StockManager/Add?id=' + selected,
title: '编辑',
onClose:function() {
onClose: function () {
refreshStockGrid();
}
});
@ -158,7 +152,7 @@
function refreshStockGrid() {
$('#@_gridId').datagrid('refresh');
// loadDataGrid();
// loadDataGrid();
}
//@@ sourceURL=StockManagerIndex.js
</script>

14
OpenAuth.Repository/OrgRepository.cs
View File

@ -24,5 +24,19 @@ namespace OpenAuth.Repository
return result;
}
public IEnumerable<Org> GetSubOrgs(int orgId)
{
string cascadeId = "0.";
if (orgId != 0)
{
var org = FindSingle(u => u.Id == orgId);
if (org == null)
throw new Exception("未能找到指定对象信息");
cascadeId = org.CascadeId;
}
return Find(u => u.CascadeId.Contains(cascadeId) && u.Id != orgId);
}
}
}

2
OpenAuth.Repository/StockRepository.cs
View File

@ -15,7 +15,7 @@ namespace OpenAuth.Repository
public IEnumerable<Stock> LoadInOrgs(params int[] orgId)
{
var result = from stock in Context.Stocks where orgId.Contains(stock.Id)
var result = from stock in Context.Stocks where orgId.Contains(stock.OrgId)
select stock;
return result;

BIN
建表&初始化数据.sql
View File

Binary file not shown.