Quellcode durchsuchen

😎1、修复在线用户重复连接问题 2、升级依赖

zuohuaijun vor 2 Jahren
Ursprung
Commit
050ee63400

+ 6 - 6
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -18,9 +18,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.6" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.11" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.11" />
-    <PackageReference Include="Furion.Pure" Version="4.9.5.11" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.12" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.12" />
+    <PackageReference Include="Furion.Pure" Version="4.9.5.12" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
@@ -39,7 +39,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.169" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1091" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1093" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
@@ -47,7 +47,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
-    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.8" />
+    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.33" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.33" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.33" />
@@ -57,7 +57,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.2.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.2.0" />
-    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
+    <PackageReference Include="Lazy.Captcha.Core" Version="2.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />

+ 5 - 6
Admin.NET/Admin.NET.Core/Hub/OnlineUserHub.cs

@@ -47,7 +47,7 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
         var account = httpContext.User.FindFirst(ClaimConst.Account)?.Value;
         var realName = httpContext.User.FindFirst(ClaimConst.RealName)?.Value;
         var tenantId = (httpContext.User.FindFirst(ClaimConst.TenantId)?.Value).ToLong();
-        var device = httpContext.GetClientDeviceInfo().Trim();
+        //var device = httpContext.GetClientDeviceInfo().Trim();
 
         if (userId < 0 || string.IsNullOrWhiteSpace(account)) return;
         var user = new SysOnlineUser
@@ -69,9 +69,9 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
         {
             _sysCacheService.HashAdd(CacheConst.KeyUserOnline, "" + user.UserId, user);
         }
-        else  // 非单用户登录则绑定用户设备信息
+        else  // 非单用户登录则绑定用户连接信息
         {
-            _sysCacheService.HashAdd(CacheConst.KeyUserOnline, user.UserId + device, user);
+            _sysCacheService.HashAdd(CacheConst.KeyUserOnline, user.UserId + Context.ConnectionId, user);
         }
 
         // 以租户Id进行分组
@@ -112,9 +112,8 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
         }
         else
         {
-            var device = httpContext.GetClientDeviceInfo().Trim();
-            _sysCacheService.HashDel<SysOnlineUser>(CacheConst.KeyUserOnline, user.UserId + device);
-            // _sysCacheService.Remove(CacheConst.KeyUserOnline + user.UserId + device);
+            _sysCacheService.HashDel<SysOnlineUser>(CacheConst.KeyUserOnline, user.UserId + Context.ConnectionId);
+            // _sysCacheService.Remove(CacheConst.KeyUserOnline + user.UserId + Context.ConnectionId);
         }
 
         // 通知当前组用户变动

+ 4 - 4
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.09.21",
+	"lastBuildTime": "2024.09.24",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -55,12 +55,12 @@
 		"splitpanes": "^3.1.5",
 		"vcrontab-3": "^3.3.22",
 		"vform3-builds": "^3.0.10",
-		"vue": "^3.5.7",
+		"vue": "^3.5.8",
 		"vue-clipboard3": "^2.0.0",
 		"vue-demi": "^0.14.6",
 		"vue-draggable-plus": "^0.5.3",
 		"vue-grid-layout": "3.0.0-beta1",
-		"vue-i18n": "^10.0.1",
+		"vue-i18n": "^10.0.3",
 		"vue-json-pretty": "^2.4.0",
 		"vue-plugin-hiprint": "0.0.57-beta27",
 		"vue-router": "^4.4.5",
@@ -78,7 +78,7 @@
 		"@typescript-eslint/parser": "^8.6.0",
 		"@vitejs/plugin-vue": "^5.1.4",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",
-		"@vue/compiler-sfc": "^3.5.7",
+		"@vue/compiler-sfc": "^3.5.8",
 		"code-inspector-plugin": "^0.16.1",
 		"eslint": "^9.11.0",
 		"eslint-plugin-vue": "^9.28.0",