diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/OnlineService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/OnlineService.cs index c0395e4d..5691a705 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/OnlineService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/OnlineService.cs @@ -12,8 +12,8 @@ namespace Yi.Framework.Rbac.Application.Services.Monitor public class OnlineService : ApplicationService, IOnlineService { private ILogger _logger; - private IHubContext _hub; - public OnlineService(ILogger logger, IHubContext hub) + private IHubContext _hub; + public OnlineService(ILogger logger, IHubContext hub) { _logger = logger; _hub = hub; @@ -26,7 +26,7 @@ namespace Yi.Framework.Rbac.Application.Services.Monitor /// public Task> GetListAsync([FromQuery] OnlineUserModel online) { - var data = OnlineUserHub.clientUsers; + var data = OnlineHub.clientUsers; IEnumerable dataWhere = data.AsEnumerable(); if (!string.IsNullOrEmpty(online.Ipaddr)) @@ -50,7 +50,7 @@ namespace Yi.Framework.Rbac.Application.Services.Monitor [Route("online/{connnectionId}")] public async Task ForceOut(string connnectionId) { - if (OnlineUserHub.clientUsers.Exists(u => u.ConnnectionId == connnectionId)) + if (OnlineHub.clientUsers.Exists(u => u.ConnnectionId == connnectionId)) { //前端接受到这个事件后,触发前端自动退出 await _hub.Clients.Client(connnectionId).SendAsync("forceOut", "你已被强制退出!"); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/NoticeHub.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/NoticeHub.cs new file mode 100644 index 00000000..262f09ac --- /dev/null +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/NoticeHub.cs @@ -0,0 +1,15 @@ +using Volo.Abp.AspNetCore.SignalR; + +namespace Yi.Framework.Rbac.Application.SignalRHubs +{ + [HubRoute("/hub/notice")] + public class NoticeHub : AbpHub + { + /// + /// 由于发布功能,主要是服务端项客户端主动推送 + /// + public NoticeHub() + { + } + } +} diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineUserHub.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineHub.cs similarity index 94% rename from Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineUserHub.cs rename to Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineHub.cs index 1d4afac5..8a269c6e 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineUserHub.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/SignalRHubs/OnlineHub.cs @@ -10,14 +10,14 @@ namespace Yi.Framework.Rbac.Application.SignalRHubs { [HubRoute("/hub/main")] [Authorize] - public class OnlineUserHub : AbpHub + public class OnlineHub : AbpHub { public static readonly List clientUsers = new(); private readonly static object objLock = new object(); private HttpContext? _httpContext; - private ILogger _logger => LoggerFactory.CreateLogger(); - public OnlineUserHub(IHttpContextAccessor httpContextAccessor) + private ILogger _logger => LoggerFactory.CreateLogger(); + public OnlineHub(IHttpContextAccessor httpContextAccessor) { _httpContext = httpContextAccessor?.HttpContext; }