Merge branch 'master' of https://gitee.com/izory/ZrAdminNetCore

ZR.Admin.WebApi/Hubs/MessageHub.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 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;
@@ -19,7 +20,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)
         {
@@ -43,12 +44,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());
@@ -69,10 +76,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);
         }

ZR.Admin.WebApi/Hubs/OnlineUsers.cs

@@ -17,6 +17,7 @@ namespace ZR.Model
         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)
         {

ZR.Admin.WebApi/ZR.Admin.WebApi.csproj

@@ -14,10 +14,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
-		<PackageReference Include="EPPlus" Version="5.8.6" />
+		<PackageReference Include="EPPlus" Version="6.0.4" />
 		<PackageReference Include="Hei.Captcha" Version="0.3.0" />
 		<PackageReference Include="IPTools.China" Version="1.6.0" />
-		<PackageReference Include="CSRedisCore" Version="3.6.9" />
+		<PackageReference Include="CSRedisCore" Version="3.8.2" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0" NoWarn="NU1605" />
 		<PackageReference Include="NETCore.Encrypt" Version="2.1.0" />
@@ -25,8 +25,8 @@
 		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
 		<PackageReference Include="Snowflake.Core" Version="2.0.0" />
 		<PackageReference Include="SqlSugar.IOC" Version="1.8.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.2" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.3" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 	</ItemGroup>
 

ZR.CodeGenerator/ZR.CodeGenerator.csproj

@@ -12,6 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="JinianNet.JNTemplate" Version="2.3.0" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8" />
+    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8.6" />
   </ItemGroup>
 </Project>

ZR.Common/ZR.Common.csproj

@@ -6,9 +6,9 @@
 
   <ItemGroup>
     <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
-    <PackageReference Include="CSRedisCore" Version="3.6.9" />
+    <PackageReference Include="CSRedisCore" Version="3.8.2" />
-    <PackageReference Include="EPPlus" Version="5.8.6" />
+    <PackageReference Include="EPPlus" Version="6.0.4" />
-    <PackageReference Include="MailKit" Version="3.1.1" />
+    <PackageReference Include="MailKit" Version="3.2.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
   </ItemGroup>
 

ZR.Model/ZR.Model.csproj

@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EPPlus" Version="5.8.6" />
+    <PackageReference Include="EPPlus" Version="6.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8" />
+    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8.6" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 

ZR.Repository/ZR.Repository.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="MySql.Data" Version="8.0.29" />
     <PackageReference Include="NETCore.Encrypt" Version="2.1.0" />
     <PackageReference Include="SqlSugar.IOC" Version="1.8.0" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8" />
+    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8.6" />
   </ItemGroup>
 
   <ItemGroup>