Skip to content

Commit db6b9e4

Browse files
CyaimCyaim
committed
Merge branch 'merge'
2 parents 1e70df7 + 9be1b79 commit db6b9e4

5 files changed

Lines changed: 23 additions & 36 deletions

File tree

‎Cyaim.WebSocketServer/Cluster/Cyaim.WebSocketServer.Cluster.Hybrid.MessageQueue.RabbitMQ/Cyaim.WebSocketServer.Cluster.Hybrid.MessageQueue.RabbitMQ.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
@@ -29,15 +29,12 @@
2929
</ItemGroup>
3030
<!-- .NET Standard 2.1 需要显式引用，使用最新稳定版 -->
3131
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
32-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions"
33-
Version="9.0.0" />
34-
<PackageReference Include="System.Text.Json"
35-
Version="9.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
33+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
3634
</ItemGroup>
3735
<!-- RabbitMQ.Client 7.0+ 支持 .NET Standard 2.0+，统一使用 7.2.0 -->
3836
<ItemGroup>
39-
<PackageReference Include="RabbitMQ.Client"
40-
Version="7.2.0" />
37+
<PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
4138
<ProjectReference Include="..\Cyaim.WebSocketServer.Cluster.Hybrid\Cyaim.WebSocketServer.Cluster.Hybrid.csproj" />
4239
</ItemGroup>
4340
<ItemGroup>

‎Cyaim.WebSocketServer/Cluster/Cyaim.WebSocketServer.Cluster.Hybrid.Redis.FreeRedis/Cyaim.WebSocketServer.Cluster.Hybrid.Redis.FreeRedis.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<!-- .NET Standard 2.1 需要显式引用，使用最新稳定版本 -->
3232
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
3333
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
34-
<PackageReference Include="System.Text.Json" Version="9.0.0" />
34+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="FreeRedis" Version="1.2.0" />
38+
<PackageReference Include="FreeRedis" Version="1.5.5" />
3939
<ProjectReference Include="..\Cyaim.WebSocketServer.Cluster.Hybrid\Cyaim.WebSocketServer.Cluster.Hybrid.csproj" />
4040
</ItemGroup>
4141

‎Cyaim.WebSocketServer/Cluster/Cyaim.WebSocketServer.Cluster.Hybrid/Cyaim.WebSocketServer.Cluster.Hybrid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
3636
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
3737
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
38-
<PackageReference Include="System.Text.Json" Version="9.0.0" />
38+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
3939
</ItemGroup>
4040

4141
<!-- .NET 6.0+ 框架已内置这些包，无需显式引用，框架会自动使用内置版本 -->

‎Cyaim.WebSocketServer/Cyaim.WebSocketServer/Cyaim.WebSocketServer.csproj‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
@@ -71,26 +71,16 @@
7171
<!-- 对于 .NET Standard 2.1 版本 -->
7272
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
7373
<!-- <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" /> -->
74-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions"
75-
Version="2.1.1" />
76-
<PackageReference Include="Microsoft.CSharp"
77-
Version="4.7.0" />
78-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions"
79-
Version="8.0.1" />
80-
<PackageReference Include="Microsoft.Extensions.DependencyInjection"
81-
Version="8.0.0" />
82-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"
83-
Version="8.0.1" />
84-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions"
85-
Version="8.0.0" />
86-
<PackageReference Include="Microsoft.Extensions.ObjectPool"
87-
Version="8.0.11" />
88-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions"
89-
Version="2.1.1" />
90-
<PackageReference Include="System.Text.Json"
91-
Version="8.0.6" />
92-
<PackageReference Include="System.Threading.Channels"
93-
Version="8.0.0" />
74+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
75+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
76+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
77+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
78+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
79+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
80+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.11" />
81+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.1" />
82+
<PackageReference Include="System.Text.Json" Version="8.0.6" />
83+
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
9484
</ItemGroup>
9585
<!-- .NET Standard 2.1 需要显式引用所有依赖包，使用最新稳定版本以避免安全漏洞 -->
9686
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
@@ -103,8 +93,8 @@
10393
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
10494
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
10595
<PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.3.0" />
106-
<PackageReference Include="System.Text.Json" Version="9.0.0" />
107-
<PackageReference Include="System.Threading.Channels" Version="9.0.0" />
96+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
97+
<PackageReference Include="System.Threading.Channels" Version="10.0.2" />
10898
</ItemGroup>
10999

110100
<!-- .NET 6.0+ 框架已内置大部分包，无需显式引用，除非需要特定版本 -->

‎Cyaim.WebSocketServer/Cyaim.WebSocketServer/Infrastructure/WebSocketManager.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ private static async Task SendStreamDataAsync(WebSocket webSocket, WebSocketMess
276276
{
277277
totalBytesRead += bytesRead;
278278
}
279-
279+
280280
if (totalBytesRead > 0)
281281
{
282282
await webSocket.SendAsync(new ArraySegment<byte>(buffer, 0, totalBytesRead), messageType, endOfMessage: true, cancellationToken);
@@ -661,7 +661,7 @@ public static async Task<Dictionary<string, bool>> SendAsync(
661661
// Use cluster routing / 使用集群路由
662662
var connectionIdsList = connectionIds.ToList();
663663
var connectionIdsArray = connectionIdsList.ToArray();
664-
664+
665665
var results = await clusterManager.RouteMessagesAsync(connectionIdsArray, data, (int)messageType);
666666
return results;
667667
}
@@ -978,7 +978,7 @@ public static async Task<Dictionary<string, bool>> SendAsync(
978978
// Use local WebSocket / 使用本地 WebSocket
979979
var results = new Dictionary<string, bool>();
980980
var connectionIdList = connectionIds.Where(id => !string.IsNullOrEmpty(id)).ToList();
981-
981+
982982
if (connectionIdList.Count == 0)
983983
{
984984
return results;

0 commit comments

Comments
 (0)