lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-12-26 22:25:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

全面修改Id为Guid类型，为2.0版做准备

Browse Source
This commit is contained in:
yubaolee
2016-09-02 18:05:17 +08:00
parent a8fd59e247
commit 574f5f9e1f
327 changed files with 10071 additions and 18206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenAuth.Domain/Service/ModuleEleManService.cs
View File

@@ -10,6 +10,7 @@
// ***********************************************************************
using System;
using System.Collections.Generic;
using System.Linq;
using OpenAuth.Domain.Interface;
@@ -33,7 +34,7 @@ namespace OpenAuth.Domain.Service
public void AddOrUpdate(ModuleElement model)
{
if (model.Id == 0)
if (model.Id == Guid.Empty)
{
_unitWork.Add(model);
}
@@ -45,7 +46,7 @@ namespace OpenAuth.Domain.Service
_unitWork.Save();
}
public IEnumerable<ModuleElement> LoadByModuleId(string loginuser, int id)
public IEnumerable<ModuleElement> LoadByModuleId(string loginuser, Guid id)
{
_authoriseService.LoadAuthControls(loginuser);
if (_authoriseService.ModuleElements.Count == 0) //用户没有任何资源
@@ -67,7 +68,7 @@ namespace OpenAuth.Domain.Service
/// 当为UserElement时，表示UserId
/// </param>
/// <param name="moduleId">模块ID</param>
public List<dynamic> LoadWithAccess(string username, string accessType, int firstId, int moduleId)
public List<dynamic> LoadWithAccess(string username, string accessType, Guid firstId, Guid moduleId)
{
var listVms = new List<dynamic>();
_authoriseService.LoadAuthControls(username);
@@ -76,7 +77,7 @@ namespace OpenAuth.Domain.Service
return listVms;
}
if (moduleId == 0) return listVms;
if (moduleId == Guid.Empty) return listVms;
string modulename = _authoriseService.Modules.SingleOrDefault(u => u.Id == moduleId).Name;
foreach (var element in _authoriseService.ModuleElements.Where(u =>u.ModuleId ==moduleId))

18
OpenAuth.Domain/Service/ModuleManService.cs
View File

@@ -37,7 +37,7 @@ namespace OpenAuth.Domain.Service
/// <summary>
/// 加载一个节点下面的所有
/// </summary>
public dynamic Load(string loginuser, int parentId, int pageindex, int pagesize)
public dynamic Load(string loginuser, Guid parentId, int pageindex, int pagesize)
{
_authoriseService.LoadAuthControls(loginuser);
@@ -51,7 +51,7 @@ namespace OpenAuth.Domain.Service
};
}
var ids = GetSubIds(parentId);
var query = _authoriseService.Modules.Where(u => parentId == 0 || ids.Contains(u.ParentId));
var query = _authoriseService.Modules.Where(u => parentId == Guid.Empty || (u.ParentId != null&&ids.Contains(u.ParentId.Value)));
int total = query.Count();
var modules = query.OrderBy(u=>u.CascadeId).Skip((pageindex - 1)*pagesize).Take(pagesize);
@@ -64,7 +64,7 @@ namespace OpenAuth.Domain.Service
};
}
public void Delete(int id)
public void Delete(Guid id)
{
var del = _repository.FindSingle(u => u.Id == id);
if (del == null) return;
@@ -75,7 +75,7 @@ namespace OpenAuth.Domain.Service
public void AddOrUpdate(Module model)
{
ChangeModuleCascade(model);
if (model.Id == 0)
if (model.Id == Guid.Empty)
{
_repository.Add(model);
}
@@ -91,7 +91,7 @@ namespace OpenAuth.Domain.Service
/// 加载特定用户的模块
/// </summary>
/// <param name="userId">The user unique identifier.</param>
public List<Module> LoadForUser(int userId)
public List<Module> LoadForUser(Guid userId)
{
//用户角色
var userRoleIds =
@@ -116,7 +116,7 @@ namespace OpenAuth.Domain.Service
/// 加载特定角色的模块
/// </summary>
/// <param name="roleId">The role unique identifier.</param>
public List<Module> LoadForRole(int roleId)
public List<Module> LoadForRole(Guid roleId)
{
var moduleIds =
_relevanceRepository.Find(u => u.FirstId == roleId && u.Key == "RoleModule")
@@ -132,9 +132,9 @@ namespace OpenAuth.Domain.Service
//根据同一级中最大的语义ID
private int[] GetSubIds(int parentId)
private Guid[] GetSubIds(Guid parentId)
{
if (parentId == 0) return _repository.Find(null).Select(u => u.Id).ToArray();
if (parentId == Guid.Empty) return _repository.Find(null).Select(u => u.Id).ToArray();
var parent = _repository.FindSingle(u => u.Id == parentId);
var orgs = _repository.Find(u => u.CascadeId.Contains(parent.CascadeId)).Select(u => u.Id).ToArray();
return orgs;
@@ -152,7 +152,7 @@ namespace OpenAuth.Domain.Service
if (currentCascadeId <= objCascadeId) currentCascadeId = objCascadeId + 1;
}
if (module.ParentId != 0)
if (module.ParentId != null)
{
var parentOrg = _repository.FindSingle(o => o.Id == module.ParentId);
if (parentOrg != null)

26
OpenAuth.Domain/Service/ResManagerService.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using OpenAuth.Domain.Interface;
@@ -26,9 +27,9 @@ namespace OpenAuth.Domain.Service
_authoriseService = authoriseService;
}
public int GetResourceCntInOrg(int orgId)
public int GetResourceCntInOrg(Guid orgId)
{
if (orgId == 0)
if (orgId == Guid.Empty)
{
return _repository.Find(null).Count();
}
@@ -46,7 +47,7 @@ namespace OpenAuth.Domain.Service
/// <summary>
/// 加载用户一个节点下面的一个或全部Resources
/// </summary>
public dynamic Load(string username, int categoryId, int pageindex, int pagesize)
public dynamic Load(string username, Guid categoryId, int pageindex, int pagesize)
{
_authoriseService.LoadAuthControls(username);
if (_authoriseService.Resources.Count == 0) //用户没有任何资源
@@ -58,7 +59,8 @@ namespace OpenAuth.Domain.Service
};
}
var subIds = GetSubOrgIds(categoryId);
var query = _authoriseService.Resources.Where(u => categoryId == 0 || subIds.Contains(u.CategoryId));
var query = _authoriseService.Resources.Where(u => categoryId == Guid.Empty ||
(u.CategoryId != null && subIds.Contains(u.CategoryId.Value)));
var Resources = query.Skip((pageindex - 1) * pagesize).Take(pagesize);
int total = query.Count();
@@ -73,9 +75,9 @@ namespace OpenAuth.Domain.Service
/// <summary>
/// 获取当前节点的所有下级节点
/// </summary>
private int[] GetSubOrgIds(int orgId)
private Guid[] GetSubOrgIds(Guid orgId)
{
if (orgId == 0)
if (orgId == Guid.Empty)
{
return _categoryRepository.Find(null).Select(u => u.Id).ToArray();
}
@@ -84,7 +86,7 @@ namespace OpenAuth.Domain.Service
return orgs;
}
public Resource Find(int id)
public Resource Find(Guid id)
{
var resource = _repository.FindSingle(u => u.Id == id);
if (resource == null) return new Resource();
@@ -92,14 +94,14 @@ namespace OpenAuth.Domain.Service
return resource;
}
public void Delete(int id)
public void Delete(Guid id)
{
_repository.Delete(id);
}
public void AddOrUpdate(Resource resource)
{
if (resource.Id == 0)
if (resource.Id == Guid.Empty)
{
_repository.Add(resource);
}
@@ -119,7 +121,7 @@ namespace OpenAuth.Domain.Service
/// 当为UserResource时，表示UserId
/// </param>
/// <param name="cId">分类ID</param>
public List<dynamic> LoadWithAccess(string username, string accessType, int firstId, int cId)
public List<dynamic> LoadWithAccess(string username, string accessType, Guid firstId, Guid cId)
{
var listVms = new List<dynamic>();
_authoriseService.LoadAuthControls(username);
@@ -129,7 +131,7 @@ namespace OpenAuth.Domain.Service
}
var subIds = GetSubOrgIds(cId);
var query = _authoriseService.Resources.Where(u => cId == 0 || subIds.Contains(u.CategoryId));
var query = _authoriseService.Resources.Where(u => cId == Guid.Empty || (u.CategoryId != null &&subIds.Contains(u.CategoryId.Value)));
foreach (var element in query)
{

11
OpenAuth.Domain/Service/StockManagerService.cs
View File

@@ -26,7 +26,7 @@ namespace OpenAuth.Domain.Service
/// <summary>
/// 根据部门ID得到进出库信息
/// </summary>
public dynamic Load(string username, int orgId, int pageindex, int pagesize)
public dynamic Load(string username, Guid orgId, int pageindex, int pagesize)
{
_authoriseService.LoadAuthControls(username);
@@ -47,8 +47,7 @@ namespace OpenAuth.Domain.Service
var keys = _authoriseService.Resources.Select(r => r.Key); //用户可访问的资源的KEY列表
//由于库存Stock表开始没有设计资源有关的字段，暂时用User字段代替
Expression<Func<Stock, bool>> exp = u => orgs.Contains(u.OrgId) && (u.User == "" || keys.Contains(u.User));
Expression<Func<Stock, bool>> exp = u => u.OrgId != null &&orgs.Contains(u.OrgId.Value) && (u.Viewable == "" || keys.Contains(u.Viewable));
var stocks = _repository.Find(pageindex, pagesize, "", exp);
int total = _repository.GetCount(exp);
@@ -61,7 +60,7 @@ namespace OpenAuth.Domain.Service
};
}
public Stock Find(int id)
public Stock Find(Guid id)
{
var stock = _repository.FindSingle(u => u.Id == id);
if (stock == null) return new Stock();
@@ -69,7 +68,7 @@ namespace OpenAuth.Domain.Service
return stock;
}
public void Delete(int id)
public void Delete(Guid id)
{
_repository.Delete(id);
}
@@ -77,7 +76,7 @@ namespace OpenAuth.Domain.Service
public void AddOrUpdate(Stock stock)
{
if (stock.Id == 0)
if (stock.Id == Guid.Empty)
{
_repository.Add(stock);
}