From 973215cf8315489f5cb01400700e8b9dee304dfb 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: Wed, 8 Jun 2022 09:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Elocation=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Hubs/MessageHub.cs  | 13 ++++++++++---
 ZR.Admin.WebApi/Hubs/OnlineUsers.cs |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ZR.Admin.WebApi/Hubs/MessageHub.cs b/ZR.Admin.WebApi/Hubs/MessageHub.cs
index caf1f915..56954180 100644
--- a/ZR.Admin.WebApi/Hubs/MessageHub.cs
+++ b/ZR.Admin.WebApi/Hubs/MessageHub.cs
@@ -1,6 +1,7 @@
 using Infrastructure;
 using Infrastructure.Constant;
 using Infrastructure.Model;
+using IPTools.Core;
 using Microsoft.AspNetCore.SignalR;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Framework;
@@ -15,7 +16,7 @@ namespace ZR.Admin.WebApi.Hubs
         //创建用户集合，用于存储所有链接的用户数据
         private static readonly List<OnlineUsers> clientUsers = new();
         private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-        private ISysNoticeService SysNoticeService;
+        private readonly ISysNoticeService SysNoticeService;
         
         public MessageHub(ISysNoticeService noticeService)
         {
@@ -39,12 +40,18 @@ namespace ZR.Admin.WebApi.Hubs
         {
             var name = Context.User.Identity.Name;
             var ip = HttpContextExtension.GetClientUserIp(App.HttpContext);
+            var ip_info = IpTool.Search(ip);
+            
             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, loginUser?.UserId, ip));
+                OnlineUsers users = new(Context.ConnectionId, name, loginUser?.UserId, ip)
+                {
+                    Location = ip_info.City
+                };
+                clientUsers.Add(users);
                 Console.WriteLine($"{DateTime.Now}：{name},{Context.ConnectionId}连接服务端success，当前已连接{clientUsers.Count}个");
                 //Clients.All.SendAsync("welcome", $"欢迎您：{name},当前时间：{DateTime.Now}");
                 Clients.All.SendAsync(HubsConstant.MoreNotice, SendNotice());
@@ -65,10 +72,10 @@ namespace ZR.Admin.WebApi.Hubs
             //判断用户是否存在，否则添加集合
             if (user != null)
             {
-                Console.WriteLine($"用户{user?.Name}离开了，当前已连接{clientUsers.Count}个");
                 clientUsers.Remove(user);
                 Clients.All.SendAsync(HubsConstant.OnlineNum, clientUsers.Count);
                 Clients.All.SendAsync(HubsConstant.OnlineUser, clientUsers);
+                Console.WriteLine($"用户{user?.Name}离开了，当前已连接{clientUsers.Count}个");
             }
             return base.OnDisconnectedAsync(exception);
         }
diff --git a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs b/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
index ed5ff25e..6f7c2c89 100644
--- a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
+++ b/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
@@ -17,6 +17,7 @@ namespace ZR.Admin.WebApi.Hubs
         public string Name { get; set; }
         public DateTime LoginTime { get; set; }
         public string UserIP { get; set; }
+        public string Location { get; set; }
 
         public OnlineUsers(string clientid, string name, long? userid, string userip)
         {