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

调整组织类[Org]为[SysOrg]防止命名空间冲突

Browse Source
This commit is contained in:
yubaolee 2022-01-21 17:31:34 +08:00
parent 73b2e2aa08
commit 3f077f5d80
14 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenAuth.App/AuthStrategies/AuthStrategyContext.cs
View File

@ -59,7 +59,7 @@ namespace OpenAuth.App
get { return _strategy.Resources; }
}
public List<Org> Orgs
public List<SysOrg> Orgs
{
get { return _strategy.Orgs; }
}

4
OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs
View File

@ -99,13 +99,13 @@ namespace OpenAuth.App
}
}
public List<Org> Orgs
public List<SysOrg> Orgs
{
get
{
var orgids = UnitWork.Find<Relevance>(
u =>u.FirstId == _user.Id && u.Key == Define.USERORG).Select(u => u.SecondId);
return UnitWork.Find<Org>(u => orgids.Contains(u.Id)).ToList();
return UnitWork.Find<SysOrg>(u => orgids.Contains(u.Id)).ToList();
}
}

4
OpenAuth.App/AuthStrategies/SystemAuthStrategy.cs
View File

@ -78,9 +78,9 @@ namespace OpenAuth.App
get { return UnitWork.Find<Resource>(null).ToList(); }
}
public List<Org> Orgs
public List<SysOrg> Orgs
{
get { return UnitWork.Find<Org>(null).ToList(); }
get { return UnitWork.Find<SysOrg>(null).ToList(); }
}
public User User

2
OpenAuth.App/Interface/IAuthStrategy.cs
View File

@ -33,7 +33,7 @@ namespace OpenAuth.App
List<Resource> Resources { get; }
List<Org> Orgs { get; }
List<SysOrg> Orgs { get; }
User User
{

34
OpenAuth.App/OrgManager/OrgManagerApp.cs
View File

@ -10,27 +10,27 @@ using OpenAuth.Repository.Interface;
namespace OpenAuth.App
{
public class OrgManagerApp : BaseTreeApp<Org,OpenAuthDBContext>
public class OrgManagerApp : BaseTreeApp<SysOrg,OpenAuthDBContext>
{
private RevelanceManagerApp _revelanceApp;
/// <summary>
/// 添加部门
/// </summary>
/// <param name="org">The org.</param>
/// <param name="sysOrg">The org.</param>
/// <returns>System.Int32.</returns>
/// <exception cref="System.Exception">未能找到该组织的父节点信息</exception>
public string Add(Org org)
public string Add(SysOrg sysOrg)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
{
throw new CommonException("登录已过期", Define.INVALID_TOKEN);
}
CaculateCascade(org);
CaculateCascade(sysOrg);
UnitWork.ExecuteWithTransaction(() =>
{
UnitWork.Add(org);
UnitWork.Add(sysOrg);
UnitWork.Save();
//如果当前账号不是SYSTEM，则直接分配
@ -40,23 +40,23 @@ namespace OpenAuth.App
{
type = Define.USERORG,
firstId = loginContext.User.Id,
secIds = new[] { org.Id }
secIds = new[] { sysOrg.Id }
});
}
});
return org.Id;
return sysOrg.Id;
}
public string Update(Org org)
public string Update(SysOrg sysOrg)
{
if (org.Id == org.ParentId)
if (sysOrg.Id == sysOrg.ParentId)
{
throw new Exception("上级节点不能为自己");
}
UpdateTreeObj(org);
UpdateTreeObj(sysOrg);
return org.Id;
return sysOrg.Id;
}
/// <summary>
@ -64,15 +64,15 @@ namespace OpenAuth.App
/// </summary>
public void DelOrgCascade(string[] ids)
{
var delOrgCascadeIds = UnitWork.Find<Org>(u => ids.Contains(u.Id)).Select(u => u.CascadeId).ToArray();
var delOrgCascadeIds = UnitWork.Find<SysOrg>(u => ids.Contains(u.Id)).Select(u => u.CascadeId).ToArray();
var delOrgIds = new List<string>();
foreach (var cascadeId in delOrgCascadeIds)
{
delOrgIds.AddRange(UnitWork.Find<Org>(u=>u.CascadeId.Contains(cascadeId)).Select(u =>u.Id).ToArray());
delOrgIds.AddRange(UnitWork.Find<SysOrg>(u=>u.CascadeId.Contains(cascadeId)).Select(u =>u.Id).ToArray());
}
UnitWork.Delete<Relevance>(u =>u.Key == Define.USERORG && delOrgIds.Contains(u.SecondId));
UnitWork.Delete<Org>(u => delOrgIds.Contains(u.Id));
UnitWork.Delete<SysOrg>(u => delOrgIds.Contains(u.Id));
UnitWork.Save();
}
@ -81,16 +81,16 @@ namespace OpenAuth.App
/// 加载特定用户的部门
/// </summary>
/// <param name="userId">The user unique identifier.</param>
public List<Org> LoadForUser(string userId)
public List<SysOrg> LoadForUser(string userId)
{
var result = from userorg in UnitWork.Find<Relevance>(null)
join org in UnitWork.Find<Org>(null) on userorg.SecondId equals org.Id
join org in UnitWork.Find<SysOrg>(null) on userorg.SecondId equals org.Id
where userorg.FirstId == userId && userorg.Key == Define.USERORG
select org;
return result.ToList();
}
public OrgManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<Org,OpenAuthDBContext> repository,IAuth auth,
public OrgManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<SysOrg,OpenAuthDBContext> repository,IAuth auth,
RevelanceManagerApp revelanceApp) : base(unitWork, repository, auth)
{
_revelanceApp = revelanceApp;

4
OpenAuth.App/Test/TestOrgApp.cs
View File

@ -35,7 +35,7 @@ namespace OpenAuth.App.Test
Console.WriteLine(orgname);
var app = _autofacServiceProvider.GetService<OrgManagerApp>();
var id = app.Add(new Org
var id = app.Add(new SysOrg
{
Name = orgname,
ParentId = ""
@ -63,7 +63,7 @@ namespace OpenAuth.App.Test
Console.WriteLine(orgname);
var app = _autofacServiceProvider.GetService<OrgManagerApp>();
var id = app.Update(new Org
var id = app.Update(new SysOrg
{
Id="543a9fcf-4770-4fd9-865f-030e562be238",
Name = orgname,

4
OpenAuth.App/UserManager/UserManagerApp.cs
View File

@ -51,7 +51,7 @@ namespace OpenAuth.App
join relevance in UnitWork.Find<Relevance>(u => u.Key == "UserOrg")
on user.Id equals relevance.FirstId into temp
from r in temp.DefaultIfEmpty()
join org in UnitWork.Find<Org>(null)
join org in UnitWork.Find<SysOrg>(null)
on r.SecondId equals org.Id into orgtmp
from o in orgtmp.DefaultIfEmpty()
select new
@ -133,7 +133,7 @@ namespace OpenAuth.App
join relevance in UnitWork.Find<Relevance>(u => u.Key == "UserOrg")
on user.Id equals relevance.FirstId into temp
from r in temp.DefaultIfEmpty()
join org in UnitWork.Find<Org>(null)
join org in UnitWork.Find<SysOrg>(null)
on r.SecondId equals org.Id into orgtmp
from o in orgtmp.DefaultIfEmpty()
select new

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

@ -34,11 +34,11 @@ namespace OpenAuth.Mvc.Controllers
//添加组织提交
[HttpPost]
public string Add(Org org)
public string Add(SysOrg sysOrg)
{
try
{
_orgApp.Add(org);
_orgApp.Add(sysOrg);
}
catch (Exception ex)
{
@ -50,11 +50,11 @@ namespace OpenAuth.Mvc.Controllers
//编辑
[HttpPost]
public string Update(Org org)
public string Update(SysOrg sysOrg)
{
try
{
_orgApp.Update(org);
_orgApp.Update(sysOrg);
}
catch (Exception ex)
{

2
OpenAuth.Mvc/Controllers/UserSessionController.cs
View File

@ -118,7 +118,7 @@ namespace OpenAuth.Mvc.Controllers
/// </summary>
public string GetOrgs()
{
var resp = new Response<List<Org>>();
var resp = new Response<List<SysOrg>>();
try
{
resp.Result = _authStrategyContext.Orgs;

4
OpenAuth.Repository/Domain/Org.cs
View File

@ -18,9 +18,9 @@ namespace OpenAuth.Repository.Domain
/// 组织表
/// </summary>
[Table("Org")]
public partial class Org : TreeEntity
public partial class SysOrg : TreeEntity
{
public Org()
public SysOrg()
{
this.CascadeId= string.Empty;
this.Name= string.Empty;

2
OpenAuth.Repository/OpenAuthDBContext.cs
View File

@ -90,7 +90,7 @@ namespace OpenAuth.Repository
public virtual DbSet<Form> Forms { get; set; }
public virtual DbSet<Module> Modules { get; set; }
public virtual DbSet<ModuleElement> ModuleElements { get; set; }
public virtual DbSet<Org> Orgs { get; set; }
public virtual DbSet<SysOrg> Orgs { get; set; }
public virtual DbSet<Relevance> Relevances { get; set; }
public virtual DbSet<Resource> Resources { get; set; }
public virtual DbSet<Role> Roles { get; set; }

2
OpenAuth.Repository/Test/TestTransaction.cs
View File

@ -116,7 +116,7 @@ namespace OpenAuth.Repository.Test
});
unitWork.Update<Org>(u => u.Id == "08f41bf6-4388-4b1e-bd3e-2ff538b44b1b", u => new Org
unitWork.Update<SysOrg>(u => u.Id == "08f41bf6-4388-4b1e-bd3e-2ff538b44b1b", u => new SysOrg
{
CreateTime = DateTime.Now
});

4
OpenAuth.WebApi/Controllers/CheckController.cs
View File

@ -146,9 +146,9 @@ namespace OpenAuth.WebApi.Controllers
/// 获取登录用户的所有可访问的组织信息
/// </summary>
[HttpGet]
public Response<List<Org>> GetOrgs()
public Response<List<SysOrg>> GetOrgs()
{
var result = new Response<List<Org>>();
var result = new Response<List<SysOrg>>();
try
{
result.Result = _authStrategyContext.Orgs;

10
OpenAuth.WebApi/Controllers/OrgsController.cs
View File

@ -20,9 +20,9 @@ namespace OpenAuth.WebApi.Controllers
/// 获取机构详情
/// </summary>
[HttpGet]
public Response<Org> Get(string id)
public Response<SysOrg> Get(string id)
{
var result = new Response<Org>();
var result = new Response<SysOrg>();
try
{
result.Result = _app.Get(id);
@ -43,9 +43,9 @@ namespace OpenAuth.WebApi.Controllers
/// <param name="obj"></param>
/// <returns></returns>
[HttpPost]
public Response<Org> Add(Org obj)
public Response<SysOrg> Add(SysOrg obj)
{
var result = new Response<Org>();
var result = new Response<SysOrg>();
try
{
_app.Add(obj);
@ -62,7 +62,7 @@ namespace OpenAuth.WebApi.Controllers
//添加或修改
[HttpPost]
public Response Update(Org obj)
public Response Update(SysOrg obj)
{
var result = new Response();
try