!656 修复在线用户没有加入缓存BUG，导致系统消息发送从缓存找不到该用户，无法传达消息

Merge pull request !656 from 林海波/next

Admin.NET/Admin.NET.Core/Hub/OnlineUserHub.cs

@@ -14,14 +14,17 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
     private readonly SqlSugarRepository<SysOnlineUser> _sysOnlineUerRep;
     private readonly SysMessageService _sysMessageService;
     private readonly IHubContext<OnlineUserHub, IOnlineUserHub> _onlineUserHubContext;
+    private readonly SysCacheService _sysCacheService;
 
     public OnlineUserHub(SqlSugarRepository<SysOnlineUser> sysOnlineUerRep,
         SysMessageService sysMessageService,
-        IHubContext<OnlineUserHub, IOnlineUserHub> onlineUserHubContext)
+        IHubContext<OnlineUserHub, IOnlineUserHub> onlineUserHubContext,
+        SysCacheService sysCacheService)
     {
         _sysOnlineUerRep = sysOnlineUerRep;
         _sysMessageService = sysMessageService;
         _onlineUserHubContext = onlineUserHubContext;
+        _sysCacheService = sysCacheService;
     }
 
     /// <summary>
@@ -49,7 +52,8 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
             TenantId = string.IsNullOrWhiteSpace(tenantId) ? 0 : Convert.ToInt64(tenantId),
         };
         await _sysOnlineUerRep.InsertAsync(user);
-
+        //缓存
+        _sysCacheService.Set(CacheConst.KeyOnlineUser + user.UserId, user);
         // 以租户Id分组方便区分
         var groupName = $"{GROUP_ONLINE}{user.TenantId}";
         await _onlineUserHubContext.Groups.AddToGroupAsync(Context.ConnectionId, groupName);
@@ -77,6 +81,7 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
         if (user == null) return;
 
         await _sysOnlineUerRep.DeleteAsync(u => u.Id == user.Id);
+        _sysCacheService.Remove(CacheConst.KeyOnlineUser + user.UserId);
 
         // 通知当前组用户变动
         var userList = await _sysOnlineUerRep.AsQueryable().Filter("", true)

Admin.NET/Admin.NET.Core/Service/Message/SysMessageService.cs

@@ -44,12 +44,10 @@ public class SysMessageService : IDynamicApiController, ITransient
     [DisplayName("发送消息给除了发送人的其他人")]
     public async Task SendOtherUser(MessageInput input)
     {
-        var onlineuserlist = _sysCacheService.Get<List<SysOnlineUser>>(CacheConst.KeyOnlineUser);
-
-        var user = onlineuserlist.Where(x => x.UserId == input.UserId).ToList();
+        var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyOnlineUser + input.UserId);
         if (user != null)
         {
-            await _chatHubContext.Clients.AllExcept(user[0].ConnectionId).ReceiveMessage(input);
+            await _chatHubContext.Clients.AllExcept(user.ConnectionId).ReceiveMessage(input);
         }
     }
 
@@ -61,15 +59,9 @@ public class SysMessageService : IDynamicApiController, ITransient
     [DisplayName("发送消息给某个人")]
     public async Task SendUser(MessageInput input)
     {
-        var onlineuserlist = _sysCacheService.Get<List<SysOnlineUser>>(CacheConst.KeyOnlineUser);
-
-        var user = onlineuserlist.Where(x => x.UserId == input.UserId).ToList();
+        var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyOnlineUser + input.UserId);
         if (user == null) return;
-
-        foreach (var item in user)
-        {
-            await _chatHubContext.Clients.Client(item.ConnectionId).ReceiveMessage(input);
-        }
+        await _chatHubContext.Clients.Client(user.ConnectionId).ReceiveMessage(input);
     }
 
     /// <summary>
@@ -80,13 +72,11 @@ public class SysMessageService : IDynamicApiController, ITransient
     [DisplayName("发送消息给某些人")]
     public async Task SendUsers(MessageInput input)
     {
-        var onlineuserlist = _sysCacheService.Get<List<SysOnlineUser>>(CacheConst.KeyOnlineUser);
-
         var userlist = new List<string>();
-        foreach (var item in onlineuserlist)
+        foreach (var userid in input.UserIds)
         {
-            if (input.UserIds.Contains(item.UserId))
-                userlist.Add(item.ConnectionId);
+            var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyOnlineUser + userid);
+            if (user!=null) userlist.Add(user.ConnectionId);
         }
         await _chatHubContext.Clients.Clients(userlist).ReceiveMessage(input);
     }