From e904c3df69687236a0cdc270ddf88ef133fbbdca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Wed, 19 Apr 2023 18:08:38 +0800
Subject: [PATCH] Revert "1"

This reverts commit 8ed1c958af1f3589fe435a631edd6de5baf42f43.
---
 .../Rbac/SignalRHub/OnlineUserHub.cs          | 43 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/SignalRHub/OnlineUserHub.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/SignalRHub/OnlineUserHub.cs
index fe88ea7c..87d52cc8 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/SignalRHub/OnlineUserHub.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/SignalRHub/OnlineUserHub.cs
@@ -39,7 +39,7 @@ namespace Yi.Furion.Application.Rbac.SignalRHub
         public override Task OnConnectedAsync()
         {
             var name = _currentUser.UserName;
-            var loginUser = _httpContext.GetLoginLogInfo();
+            var loginUser = GetLoginLogInfo(_httpContext);
             var user = clientUsers.Any(u => u.ConnnectionId == Context.ConnectionId);
             //判断用户是否存在，否则添加集合
             if (!user)
@@ -89,5 +89,46 @@ namespace Yi.Furion.Application.Rbac.SignalRHub
             await Clients.All.SendAsync("ReceiveAllInfo", test);
         }
 
+        /// <summary>
+        /// 获取客户端信息
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        private static ClientInfo GetClientInfo(HttpContext context)
+        {
+            var str = context.GetUserAgent();
+            var uaParser = Parser.GetDefault();
+            ClientInfo c = uaParser.Parse(str);
+            return c;
+        }
+
+        /// <summary>
+        /// 记录用户登陆信息
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        private static LoginLogEntity GetLoginLogInfo(HttpContext context)
+        {
+            var ipAddr = context.GetClientIp();
+            IpInfo location;
+            if (ipAddr == "127.0.0.1")
+            {
+                location = new IpInfo() { Province = "本地", City = "本机" };
+            }
+            else
+            {
+                location = IpTool.Search(ipAddr);
+            }
+            ClientInfo clientInfo = GetClientInfo(context);
+            LoginLogEntity entity = new()
+            {
+                Browser = clientInfo.Device.Family,
+                Os = clientInfo.OS.ToString(),
+                LoginIp = ipAddr,
+                LoginLocation = location.Province + "-" + location.City
+            };
+
+            return entity;
+        }
     }
 }
\ No newline at end of file