lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-11-09 10:54:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

调整User为SysUser、Resource为SysResource

Browse Source
This commit is contained in:
yubaolee
2025-02-19 12:44:42 +08:00
parent 839256e8bb
commit 2a2d83d026
27 changed files with 417 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ namespace OpenAuth.App
this._strategy = strategy;
}
public User User
public SysUser User
{
get { return _strategy.User; }
}
@@ -54,7 +54,7 @@ namespace OpenAuth.App
get { return _strategy.Roles; }
}
public List<Resource> Resources
public List<SysResource> Resources
{
get { return _strategy.Resources; }
}

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

@@ -30,10 +30,10 @@ namespace OpenAuth.App
/// <summary>
/// 普通用户授权策略
/// </summary>
public class NormalAuthStrategy : SqlSugarBaseApp<User>, IAuthStrategy
public class NormalAuthStrategy : SqlSugarBaseApp<SysUser>, IAuthStrategy
{
protected User _user;
protected SysUser _user;
private List<string> _userRoleIds; //用户角色GUID
private DbExtension _dbExtension;
@@ -79,14 +79,14 @@ namespace OpenAuth.App
get { return SugarClient.Queryable<Role>().Where(u => _userRoleIds.Contains(u.Id)).ToList(); }
}
public List<Resource> Resources
public List<SysResource> Resources
{
get
{
var resourceIds = SugarClient.Queryable<Relevance>().Where(
u =>
u.Key == Define.ROLERESOURCE && _userRoleIds.Contains(u.FirstId)).Select(u => u.SecondId).ToList();
return SugarClient.Queryable<Resource>().Where(u => resourceIds.Contains(u.Id)).ToList();
return SugarClient.Queryable<SysResource>().Where(u => resourceIds.Contains(u.Id)).ToList();
}
}
@@ -97,7 +97,7 @@ namespace OpenAuth.App
var orgids = SugarClient.Queryable<Relevance>().Where(
u =>u.FirstId == _user.Id && u.Key == Define.USERORG).Select(u => u.SecondId).ToList();
return SugarClient.Queryable<SysOrg>().Where(org =>orgids.Contains(org.Id))
.LeftJoin<User>((org, user) => org.ChairmanId ==user.Id)
.LeftJoin<SysUser>((org, user) => org.ChairmanId ==user.Id)
.Select((org,user)=>new OrgView
{
Id = org.Id.SelectAll(),
@@ -106,7 +106,7 @@ namespace OpenAuth.App
}
}
public User User
public SysUser User
{
get { return _user; }
set

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

@@ -31,9 +31,9 @@ namespace OpenAuth.App
/// <para>超级管理员权限</para>
/// <para>超级管理员使用guid.empty为ID，可以根据需要修改</para>
/// </summary>
public class SystemAuthStrategy : SqlSugarBaseApp<User>, IAuthStrategy
public class SystemAuthStrategy : SqlSugarBaseApp<SysUser>, IAuthStrategy
{
protected User _user;
protected SysUser _user;
private DbExtension _dbExtension;
public List<ModuleView> Modules
@@ -54,15 +54,15 @@ namespace OpenAuth.App
get { return SugarClient.Queryable<ModuleElement>().ToList(); }
}
public List<Resource> Resources
public List<SysResource> Resources
{
get { return SugarClient.Queryable<Resource>().ToList(); }
get { return SugarClient.Queryable<SysResource>().ToList(); }
}
public List<OrgView> Orgs
{
get { return SugarClient.Queryable<SysOrg>()
.LeftJoin<User>((org, user) => org.ChairmanId ==user.Id)
.LeftJoin<SysUser>((org, user) => org.ChairmanId ==user.Id)
.Select((org,user)=>new OrgView
{
Id = org.Id.SelectAll(),
@@ -70,7 +70,7 @@ namespace OpenAuth.App
}).ToList(); }
}
public User User
public SysUser User
{
get { return _user; }
set //禁止外部设置
@@ -94,7 +94,7 @@ namespace OpenAuth.App
public SystemAuthStrategy(ISqlSugarClient client,DbExtension dbExtension) : base(client, null)
{
_dbExtension = dbExtension;
_user = new User
_user = new SysUser
{
Account = Define.SYSTEM_USERNAME,
Name = "超级管理员",