😎新增账号变动事件订阅功能
This commit is contained in:
parent
798af00749
commit
e1cdee13da
62
Admin.NET/Admin.NET.Core/Enum/SysUserEventTypeEnum.cs
Normal file
62
Admin.NET/Admin.NET.Core/Enum/SysUserEventTypeEnum.cs
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||||
|
//
|
||||||
|
// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||||
|
//
|
||||||
|
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
|
||||||
|
|
||||||
|
namespace Admin.NET.Core;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 事件类型-系统用户操作枚举
|
||||||
|
/// </summary>
|
||||||
|
[Description("事件类型-系统用户操作枚举")]
|
||||||
|
public enum SysUserEventTypeEnum
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 增加用户
|
||||||
|
/// </summary>
|
||||||
|
[Description("增加用户")]
|
||||||
|
Add = 111,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新用户
|
||||||
|
/// </summary>
|
||||||
|
[Description("更新用户")]
|
||||||
|
Update = 222,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 授权用户角色
|
||||||
|
/// </summary>
|
||||||
|
[Description("授权用户角色")]
|
||||||
|
UpdateRole = 333,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除用户
|
||||||
|
/// </summary>
|
||||||
|
[Description("删除用户")]
|
||||||
|
Delete = 444,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置用户状态
|
||||||
|
/// </summary>
|
||||||
|
[Description("设置用户状态")]
|
||||||
|
SetStatus = 555,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 修改密码
|
||||||
|
/// </summary>
|
||||||
|
[Description("修改密码")]
|
||||||
|
ChangePwd = 666,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 重置密码
|
||||||
|
/// </summary>
|
||||||
|
[Description("重置密码")]
|
||||||
|
ResetPwd = 777,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解除登录锁定
|
||||||
|
/// </summary>
|
||||||
|
[Description("解除登录锁定")]
|
||||||
|
UnlockLogin = 888
|
||||||
|
}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||||
|
//
|
||||||
|
// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||||
|
//
|
||||||
|
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
|
||||||
|
|
||||||
|
namespace Admin.NET.Core.Service;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 系统用户操作事件参数
|
||||||
|
/// </summary>
|
||||||
|
public class SysUserEventArgs : EventArgs
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 事件类型
|
||||||
|
/// </summary>
|
||||||
|
[Required]
|
||||||
|
public SysUserEventTypeEnum EventType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 接口输入参数
|
||||||
|
/// </summary>
|
||||||
|
public object Input { get; set; }
|
||||||
|
|
||||||
|
public SysUserEventArgs(SysUserEventTypeEnum eventType, object input)
|
||||||
|
{
|
||||||
|
this.EventType = eventType;
|
||||||
|
this.Input = input;
|
||||||
|
}
|
||||||
|
}
|
||||||
32
Admin.NET/Admin.NET.Core/Service/User/SysUserEventHandler.cs
Normal file
32
Admin.NET/Admin.NET.Core/Service/User/SysUserEventHandler.cs
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||||
|
//
|
||||||
|
// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||||
|
//
|
||||||
|
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
|
||||||
|
|
||||||
|
namespace Admin.NET.Core.Service;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 系统用户事件处理类
|
||||||
|
/// </summary>
|
||||||
|
public class SysUserEventHandler : ISingleton
|
||||||
|
{
|
||||||
|
private event EventHandler Event;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 订阅
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="eventHandler"></param>
|
||||||
|
public void Subscribe(EventHandler eventHandler) => Event += eventHandler;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 发布事件
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="eventType"></param>
|
||||||
|
/// <param name="input"></param>
|
||||||
|
public void OnEvent(object sender, SysUserEventTypeEnum eventType, object input)
|
||||||
|
{
|
||||||
|
Event?.Invoke(sender, new SysUserEventArgs(eventType, input));
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -22,6 +22,7 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
private readonly SysCacheService _sysCacheService;
|
private readonly SysCacheService _sysCacheService;
|
||||||
private readonly SysUserLdapService _sysUserLdapService;
|
private readonly SysUserLdapService _sysUserLdapService;
|
||||||
private readonly SqlSugarRepository<SysUser> _sysUserRep;
|
private readonly SqlSugarRepository<SysUser> _sysUserRep;
|
||||||
|
private readonly SysUserEventHandler _sysUserEventHandler;
|
||||||
|
|
||||||
public SysUserService(UserManager userManager,
|
public SysUserService(UserManager userManager,
|
||||||
SysOrgService sysOrgService,
|
SysOrgService sysOrgService,
|
||||||
@ -32,7 +33,8 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
SysOnlineUserService sysOnlineUserService,
|
SysOnlineUserService sysOnlineUserService,
|
||||||
SysCacheService sysCacheService,
|
SysCacheService sysCacheService,
|
||||||
SysUserLdapService sysUserLdapService,
|
SysUserLdapService sysUserLdapService,
|
||||||
SqlSugarRepository<SysUser> sysUserRep)
|
SqlSugarRepository<SysUser> sysUserRep,
|
||||||
|
SysUserEventHandler sysUserEventHandler)
|
||||||
{
|
{
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
_sysOrgService = sysOrgService;
|
_sysOrgService = sysOrgService;
|
||||||
@ -44,6 +46,7 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
_sysCacheService = sysCacheService;
|
_sysCacheService = sysCacheService;
|
||||||
_sysUserLdapService = sysUserLdapService;
|
_sysUserLdapService = sysUserLdapService;
|
||||||
_sysUserRep = sysUserRep;
|
_sysUserRep = sysUserRep;
|
||||||
|
_sysUserEventHandler = sysUserEventHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -113,6 +116,9 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
if (!string.IsNullOrWhiteSpace(input.DomainAccount))
|
if (!string.IsNullOrWhiteSpace(input.DomainAccount))
|
||||||
await _sysUserLdapService.AddUserLdap(newUser.TenantId.Value, newUser.Id, newUser.Account, input.DomainAccount);
|
await _sysUserLdapService.AddUserLdap(newUser.TenantId.Value, newUser.Id, newUser.Account, input.DomainAccount);
|
||||||
|
|
||||||
|
// 执行订阅事件
|
||||||
|
_sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.Add, input);
|
||||||
|
|
||||||
return newUser.Id;
|
return newUser.Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -144,6 +150,9 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
await _sysOnlineUserService.ForceOffline(input.Id);
|
await _sysOnlineUserService.ForceOffline(input.Id);
|
||||||
// 更新域账号
|
// 更新域账号
|
||||||
await _sysUserLdapService.AddUserLdap(user.TenantId.Value, user.Id, user.Account, input.DomainAccount);
|
await _sysUserLdapService.AddUserLdap(user.TenantId.Value, user.Id, user.Account, input.DomainAccount);
|
||||||
|
|
||||||
|
// 执行订阅事件
|
||||||
|
_sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.Update, input);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -195,6 +204,9 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
|
|
||||||
// 删除域账号
|
// 删除域账号
|
||||||
await _sysUserLdapService.DeleteUserLdapByUserId(input.Id);
|
await _sysUserLdapService.DeleteUserLdapByUserId(input.Id);
|
||||||
|
|
||||||
|
// 执行订阅事件
|
||||||
|
_sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.Delete, input);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -241,7 +253,12 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
await SetUserBalckList(user, input.Status);
|
await SetUserBalckList(user, input.Status);
|
||||||
|
|
||||||
user.Status = input.Status;
|
user.Status = input.Status;
|
||||||
return await _sysUserRep.AsUpdateable(user).UpdateColumns(u => new { u.Status }).ExecuteCommandAsync();
|
var rows = await _sysUserRep.AsUpdateable(user).UpdateColumns(u => new { u.Status }).ExecuteCommandAsync();
|
||||||
|
|
||||||
|
// 执行订阅事件
|
||||||
|
if (rows > 0) _sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.SetStatus, input);
|
||||||
|
|
||||||
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -280,6 +297,9 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
// throw Oops.Oh(ErrorCodeEnum.D1022);
|
// throw Oops.Oh(ErrorCodeEnum.D1022);
|
||||||
|
|
||||||
await _sysUserRoleService.GrantUserRole(input);
|
await _sysUserRoleService.GrantUserRole(input);
|
||||||
|
|
||||||
|
// 执行订阅事件
|
||||||
|
_sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.UpdateRole, input);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -322,7 +342,12 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
}
|
}
|
||||||
|
|
||||||
user.LastChangePasswordTime = DateTime.Now;
|
user.LastChangePasswordTime = DateTime.Now;
|
||||||
return await _sysUserRep.AsUpdateable(user).UpdateColumns(u => new { u.Password, u.LastChangePasswordTime }).ExecuteCommandAsync();
|
var rows = await _sysUserRep.AsUpdateable(user).UpdateColumns(u => new { u.Password, u.LastChangePasswordTime }).ExecuteCommandAsync();
|
||||||
|
|
||||||
|
// 执行订阅事件
|
||||||
|
if (rows > 0) _sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.ChangePwd, input);
|
||||||
|
|
||||||
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -343,6 +368,9 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
var keyPasswordErrorTimes = $"{CacheConst.KeyPasswordErrorTimes}{user.Account}";
|
var keyPasswordErrorTimes = $"{CacheConst.KeyPasswordErrorTimes}{user.Account}";
|
||||||
_sysCacheService.Remove(keyPasswordErrorTimes);
|
_sysCacheService.Remove(keyPasswordErrorTimes);
|
||||||
|
|
||||||
|
// 执行订阅事件
|
||||||
|
_sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.ResetPwd, input);
|
||||||
|
|
||||||
return password;
|
return password;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -359,6 +387,9 @@ public class SysUserService : IDynamicApiController, ITransient
|
|||||||
// 清空密码错误次数
|
// 清空密码错误次数
|
||||||
var keyPasswordErrorTimes = $"{CacheConst.KeyPasswordErrorTimes}{user.Account}";
|
var keyPasswordErrorTimes = $"{CacheConst.KeyPasswordErrorTimes}{user.Account}";
|
||||||
_sysCacheService.Remove(keyPasswordErrorTimes);
|
_sysCacheService.Remove(keyPasswordErrorTimes);
|
||||||
|
|
||||||
|
// 执行订阅事件
|
||||||
|
_sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.UnlockLogin, input);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user