lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-12-28 17:34:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

调整结构

Browse Source
This commit is contained in:
yubaolee
2017-10-11 16:19:34 +08:00
parent 22ba70b47c
commit 0659eb84c1
101 changed files with 2349 additions and 2224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenAuth.Domain/Service/AuthoriseService.cs
View File

@@ -25,7 +25,7 @@ namespace OpenAuth.Domain.Service
protected IUnitWork _unitWork;
protected User _user;
private List<Guid> _userRoleIds; //用户角色GUID
private List<string> _userRoleIds; //用户角色GUID
public AuthoriseService(IUnitWork unitWork)
{

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

@@ -34,7 +34,7 @@ namespace OpenAuth.Domain.Service
public void AddOrUpdate(ModuleElement model)
{
if (model.Id == Guid.Empty)
if (model.Id == string.Empty)
{
_unitWork.Add(model);
}
@@ -46,7 +46,7 @@ namespace OpenAuth.Domain.Service
_unitWork.Save();
}
public IEnumerable<ModuleElement> LoadByModuleId(string loginuser, Guid id)
public IEnumerable<ModuleElement> LoadByModuleId(string loginuser, string id)
{
var service = _factory.Create(loginuser);
if (!service.GetModuleElementsQuery().Any()) //用户没有任何资源
@@ -68,7 +68,7 @@ namespace OpenAuth.Domain.Service
/// 当为UserElement时，表示UserId
/// </param>
/// <param name="moduleId">模块ID</param>
public List<dynamic> LoadWithAccess(string username, string accessType, Guid firstId, Guid moduleId)
public List<dynamic> LoadWithAccess(string username, string accessType, string firstId, string moduleId)
{
var listVms = new List<dynamic>();
var service = _factory.Create(username);
@@ -76,7 +76,7 @@ namespace OpenAuth.Domain.Service
{
return listVms;
}
if (moduleId == Guid.Empty) return listVms;
if (moduleId == string.Empty) return listVms;
foreach (var element in service.GetModuleElementsQuery().Where(u =>u.ModuleId ==moduleId))
{
var accessed = _unitWork.FindSingle<Relevance>(u =>u.Key == accessType
@@ -94,7 +94,7 @@ namespace OpenAuth.Domain.Service
return listVms;
}
public void Delete(Guid[] objs)
public void Delete(string[] objs)
{
_unitWork.Delete<ModuleElement>(u =>objs.Contains(u.Id));
}

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

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

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

@@ -27,9 +27,9 @@ namespace OpenAuth.Domain.Service
_factory = authoriseService;
}
public int GetResourceCntInOrg(Guid orgId)
public int GetResourceCntInOrg(string orgId)
{
if (orgId == Guid.Empty)
if (orgId == string.Empty)
{
return _repository.Find(null).Count();
}
@@ -47,7 +47,7 @@ namespace OpenAuth.Domain.Service
/// <summary>
/// 加载用户一个节点下面的一个或全部Resources
/// </summary>
public dynamic Load(string username, Guid categoryId, int page, int rows)
public dynamic Load(string username, string categoryId, int page, int rows)
{
var service = _factory.Create(username);
if (!service.GetResourcesQuery().Any()) //用户没有任何资源
@@ -62,8 +62,8 @@ namespace OpenAuth.Domain.Service
var subIds = _categoryRepository.GetSubIds(categoryId);
var query = service.GetResourcesQuery().Where(u => categoryId == Guid.Empty ||
(u.CategoryId != null && subIds.Contains(u.CategoryId.Value)));
var query = service.GetResourcesQuery().Where(u => categoryId == string.Empty ||
(u.CategoryId != null && subIds.Contains(u.CategoryId)));
int total = query.Count();
if (total <= 0)
@@ -102,7 +102,7 @@ namespace OpenAuth.Domain.Service
public Resource Find(Guid id)
public Resource Find(string id)
{
var resource = _repository.FindSingle(u => u.Id == id);
if (resource == null) return new Resource();
@@ -110,14 +110,14 @@ namespace OpenAuth.Domain.Service
return resource;
}
public void Delete(Guid[] ids)
public void Delete(string[] ids)
{
_repository.Delete(u => ids.Contains(u.Id));
}
public void AddOrUpdate(Resource resource)
{
if (resource.Id == Guid.Empty)
if (resource.Id == string.Empty)
{
_repository.Add(resource);
}
@@ -137,7 +137,7 @@ namespace OpenAuth.Domain.Service
/// 当为UserResource时，表示UserId
/// </param>
/// <param name="cId">分类ID</param>
public List<dynamic> LoadWithAccess(string username, string accessType, Guid firstId, Guid cId)
public List<dynamic> LoadWithAccess(string username, string accessType, string firstId, string cId)
{
var listVms = new List<dynamic>();
var service = _factory.Create(username);
@@ -147,7 +147,7 @@ namespace OpenAuth.Domain.Service
}
var subIds = _categoryRepository.GetSubIds(cId);
var query = service.GetResourcesQuery().Where(u => cId == Guid.Empty || (u.CategoryId != null && subIds.Contains(u.CategoryId.Value)));
var query = service.GetResourcesQuery().Where(u => cId == string.Empty || (u.CategoryId != null && subIds.Contains(u.CategoryId)));
foreach (var element in query)
{

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

@@ -26,7 +26,7 @@ namespace OpenAuth.Domain.Service
/// <summary>
/// 根据部门ID得到进出库信息
/// </summary>
public dynamic Load(string username, Guid orgId, int pageindex, int pagesize)
public dynamic Load(string username, string orgId, int pageindex, int pagesize)
{
var service = _factory.Create(username);
@@ -48,7 +48,7 @@ namespace OpenAuth.Domain.Service
var keys = service.Resources.Select(r => r.Key); //用户可访问的资源的KEY列表
Expression<Func<Stock, bool>> exp = u => u.OrgId != null &&orgs.Contains(u.OrgId.Value) && (u.Viewable == "" || keys.Contains(u.Viewable));
Expression<Func<Stock, bool>> exp = u => u.OrgId != null &&orgs.Contains(u.OrgId) && (u.Viewable == "" || keys.Contains(u.Viewable));
var stocks = _repository.Find(pageindex, pagesize, "", exp);
int total = _repository.GetCount(exp);
@@ -62,7 +62,7 @@ namespace OpenAuth.Domain.Service
};
}
public Stock Find(Guid id)
public Stock Find(string id)
{
var stock = _repository.FindSingle(u => u.Id == id);
if (stock == null) return new Stock();
@@ -70,7 +70,7 @@ namespace OpenAuth.Domain.Service
return stock;
}
public void Delete(Guid[] id)
public void Delete(string[] id)
{
_repository.Delete(u =>id.Contains(u.Id));
}
@@ -78,7 +78,7 @@ namespace OpenAuth.Domain.Service
public void AddOrUpdate(Stock stock)
{
if (stock.Id == Guid.Empty)
if (string.IsNullOrEmpty(stock.Id))
{
_repository.Add(stock);
}

2
OpenAuth.Domain/Service/SystemAuthService.cs
View File

@@ -24,7 +24,7 @@ namespace OpenAuth.Domain.Service
{
public SystemAuthService(IUnitWork unitWork):base(unitWork)
{
_user = new User { Account = "System", Id = Guid.Empty };
_user = new User { Account = "System", Id = string.Empty };
}