From 8147df7e4973c34aea0fc725a09974cf007fed63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sat, 14 May 2022 12:38:13 +0800 Subject: [PATCH 1/3] update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index cddc2370..2fe67c3d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ * 支持加载动态权限菜单，多方式轻松权限控制 * 提供了技术栈(Ant Design Vue)版[Ant Design Vue](https://gitee.com/billzh/mc-dull.git) * 七牛云通用云产品优惠券：[点我进入](https://s.qiniu.com/FzEfay)。 -* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=uotn5vt1&share_source=copy_link)。 * 腾讯云秒杀场：[点我进入](https://curl.qcloud.com/4yEoRquq)。 * 腾讯云优惠券：[点我领取](https://curl.qcloud.com/5J4nag8D)。 From e4613336f73891b16fcbe7c54188ebf7262fc287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sun, 15 May 2022 09:23:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Infrastructure/Constant/HubsConstant.cs | 1 + ZR.Admin.WebApi/Hubs/MessageHub.cs | 12 +++++++++--- ZR.Admin.WebApi/Hubs/OnlineUsers.cs | 5 +++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Infrastructure/Constant/HubsConstant.cs b/Infrastructure/Constant/HubsConstant.cs index ad8c040c..d81b7f81 100644 --- a/Infrastructure/Constant/HubsConstant.cs +++ b/Infrastructure/Constant/HubsConstant.cs @@ -12,5 +12,6 @@ namespace Infrastructure.Constant public static string ReceiveNotice = V; public static string OnlineNum = "onlineNum"; public static string MoreNotice = "moreNotice"; + public static string OnlineUser = "onlineUser"; } } diff --git a/ZR.Admin.WebApi/Hubs/MessageHub.cs b/ZR.Admin.WebApi/Hubs/MessageHub.cs index 64ef5494..b835b1bd 100644 --- a/ZR.Admin.WebApi/Hubs/MessageHub.cs +++ b/ZR.Admin.WebApi/Hubs/MessageHub.cs @@ -2,10 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Infrastructure; using Infrastructure.Constant; using Infrastructure.Model; using Microsoft.AspNetCore.SignalR; +using ZR.Admin.WebApi.Extensions; +using ZR.Admin.WebApi.Framework; using ZR.Model; +using ZR.Model.System; using ZR.Service.System.IService; namespace ZR.Admin.WebApi.Hubs @@ -16,7 +20,7 @@ namespace ZR.Admin.WebApi.Hubs private static readonly List clientUsers = new(); private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger(); private ISysNoticeService SysNoticeService; - + public MessageHub(ISysNoticeService noticeService) { SysNoticeService = noticeService; @@ -38,18 +42,19 @@ namespace ZR.Admin.WebApi.Hubs public override Task OnConnectedAsync() { var name = Context.User.Identity.Name; - + LoginUser loginUser = JwtUtil.GetLoginUser(App.HttpContext); var user = clientUsers.Any(u => u.ConnnectionId == Context.ConnectionId); //判断用户是否存在，否则添加集合 if (!user && Context.User.Identity.IsAuthenticated) { - clientUsers.Add(new OnlineUsers(Context.ConnectionId, name)); + clientUsers.Add(new OnlineUsers(Context.ConnectionId, name, loginUser?.UserId)); Console.WriteLine($"{DateTime.Now}：{name},{Context.ConnectionId}连接服务端success，当前已连接{clientUsers.Count}个"); //Clients.All.SendAsync("welcome", $"欢迎您：{name},当前时间：{DateTime.Now}"); Clients.All.SendAsync(HubsConstant.MoreNotice, SendNotice()); } Clients.All.SendAsync(HubsConstant.OnlineNum, clientUsers.Count); + Clients.All.SendAsync(HubsConstant.OnlineUser, clientUsers); return base.OnConnectedAsync(); } @@ -66,6 +71,7 @@ namespace ZR.Admin.WebApi.Hubs Console.WriteLine($"用户{user?.Name}离开了，当前已连接{clientUsers.Count}个"); clientUsers.Remove(user); Clients.All.SendAsync(HubsConstant.OnlineNum, clientUsers.Count); + Clients.All.SendAsync(HubsConstant.OnlineUser, clientUsers); } return base.OnDisconnectedAsync(exception); } diff --git a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs b/ZR.Admin.WebApi/Hubs/OnlineUsers.cs index 78aefe29..3ad5f436 100644 --- a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs +++ b/ZR.Admin.WebApi/Hubs/OnlineUsers.cs @@ -13,15 +13,16 @@ namespace ZR.Model /// /// 用户id /// - public int Userid { get; set; } + public long? Userid { get; set; } public string Name { get; set; } public DateTime LoginTime { get; set; } - public OnlineUsers(string clientid, string name) + public OnlineUsers(string clientid, string name, long? userid) { ConnnectionId = clientid; Name = name; LoginTime = DateTime.Now; + Userid = userid; } } } From 65853659942de1c3f3028be76a94ccbf865de95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Mon, 16 May 2022 11:26:04 +0800 Subject: [PATCH 3/3] update index.vue --- ZR.Vue/src/views/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZR.Vue/src/views/index.vue b/ZR.Vue/src/views/index.vue index aa363e84..b148e795 100644 --- a/ZR.Vue/src/views/index.vue +++ b/ZR.Vue/src/views/index.vue @@ -36,7 +36,7 @@

当前版本: v{{ version }} 更新日志 + @click="goTarget('http://www.izhaorui.cn/doc/#/changelog?id=v' + version)">更新日志