feat：新增中间位置配置服务方式；添加.NET10支持

Cyaim · Cyaim · commit 7f0ea6e4eedd · 2025-11-28T11:17:05.000+08:00
diff --git a/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Client/Cyaim.WebSocketServer.Client.csproj b/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Client/Cyaim.WebSocketServer.Client.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.FreeRedis/Cyaim.WebSocketServer.Cluster.FreeRedis.csproj b/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.FreeRedis/Cyaim.WebSocketServer.Cluster.FreeRedis.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<Authors>Psyche</Authors>
@@ -17,7 +17,7 @@
 		</Description>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
@@ -26,7 +26,7 @@
 		<PackageReference Include="System.Text.Json" Version="9.0.10" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
 		<PackageReference Include="System.Text.Json" Version="8.0.6" />
 	</ItemGroup>
diff --git a/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.Hybrid.Implementations/Cyaim.WebSocketServer.Cluster.Hybrid.Implementations.csproj b/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.Hybrid.Implementations/Cyaim.WebSocketServer.Cluster.Hybrid.Implementations.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<Authors>Psyche</Authors>
@@ -17,7 +17,7 @@
 		</Description>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
@@ -26,7 +26,7 @@
 		<PackageReference Include="System.Text.Json" Version="9.0.10" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
 		<PackageReference Include="System.Text.Json" Version="8.0.6" />
 	</ItemGroup>
diff --git a/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.Hybrid/Cyaim.WebSocketServer.Cluster.Hybrid.csproj b/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.Hybrid/Cyaim.WebSocketServer.Cluster.Hybrid.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<Authors>Psyche</Authors>
@@ -19,7 +19,7 @@
 		</Description>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
@@ -28,7 +28,7 @@
 		<PackageReference Include="System.Text.Json" Version="9.0.10" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
 		<PackageReference Include="System.Text.Json" Version="8.0.6" />
 	</ItemGroup>
diff --git a/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.RabbitMQ/Cyaim.WebSocketServer.Cluster.RabbitMQ.csproj b/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.RabbitMQ/Cyaim.WebSocketServer.Cluster.RabbitMQ.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<Authors>Psyche</Authors>
@@ -17,7 +17,7 @@
 		</Description>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
@@ -26,7 +26,7 @@
 		<PackageReference Include="System.Text.Json" Version="9.0.10" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
 		<PackageReference Include="System.Text.Json" Version="8.0.6" />
 	</ItemGroup>
diff --git a/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.StackExchangeRedis/Cyaim.WebSocketServer.Cluster.StackExchangeRedis.csproj b/Cyaim.WebSocketServer/Cyaim.WebSocketServer.Cluster.StackExchangeRedis/Cyaim.WebSocketServer.Cluster.StackExchangeRedis.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<Authors>Psyche</Authors>
@@ -17,7 +17,7 @@
 		</Description>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
@@ -26,7 +26,7 @@
 		<PackageReference Include="System.Text.Json" Version="9.0.10" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
 		<PackageReference Include="System.Text.Json" Version="8.0.6" />
 	</ItemGroup>
diff --git a/Cyaim.WebSocketServer/Cyaim.WebSocketServer/Cyaim.WebSocketServer.csproj b/Cyaim.WebSocketServer/Cyaim.WebSocketServer/Cyaim.WebSocketServer.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
     </PropertyGroup>
     <PropertyGroup>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -24,7 +24,7 @@
         </Description>
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
     <!-- 对于 .NET Standard 2.1 版本 -->
@@ -89,7 +89,7 @@
                           Version="10.0.0" />
     </ItemGroup>
     <!-- OpenTelemetry Metrics for OTLP export -->
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
         <PackageReference Include="OpenTelemetry"
                           Version="1.9.0" />
         <PackageReference Include="OpenTelemetry.Extensions.Hosting"
diff --git a/Cyaim.WebSocketServer/Cyaim.WebSocketServer/Middlewares/WebSocketRouteMiddlewareExtensions.cs b/Cyaim.WebSocketServer/Cyaim.WebSocketServer/Middlewares/WebSocketRouteMiddlewareExtensions.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Linq;
 
@@ -32,6 +33,86 @@ public static IApplicationBuilder UseWebSocketServer(this IApplicationBuilder ap
             return app;
         }
 
+        /// <summary>
+        /// Add Cyaim.WebSocketServer.Infrastructure.Middlewares.WebSocketRouteMiddleware Middleware with configuration.
+        /// This overload allows you to configure WebSocketRouteOption at middleware setup time,
+        /// where you can directly access services from the application's service provider.
+        /// The websocket request will execute the with relation endpoint methods.
+        /// 
+        /// 此重载允许您在中间件设置时配置 WebSocketRouteOption，
+        /// 此时您可以直接从应用程序的服务提供者访问服务，无需手动创建 ServiceProvider。
+        /// </summary>
+        /// <param name="app">The application builder / 应用程序构建器</param>
+        /// <param name="configure">Configuration action that receives the WebSocketRouteOption and IServiceProvider / 配置操作，接收 WebSocketRouteOption 和 IServiceProvider</param>
+        /// <returns></returns>
+        public static IApplicationBuilder UseWebSocketServer(this IApplicationBuilder app, Action<WebSocketRouteOption, IServiceProvider> configure)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            if (configure == null)
+            {
+                throw new ArgumentNullException(nameof(configure));
+            }
+
+            var serviceProvider = app.ApplicationServices;
+            
+            // 尝试从服务容器中获取已配置的 WebSocketRouteOption
+            var existingOption = serviceProvider.GetService<WebSocketRouteOption>();
+            WebSocketRouteOption option;
+
+            if (existingOption != null)
+            {
+                // 如果已经通过 ConfigureWebSocketRoute 配置过，使用现有的配置并允许补充配置
+                option = existingOption;
+            }
+            else
+            {
+                // 如果没有配置过，创建新的配置
+                // 注意：这种情况下，需要确保在 configure 中完成所有必要的配置
+                option = new WebSocketRouteOption();
+            }
+
+            // 执行配置操作，传入 option 和 serviceProvider，此时可以直接从 serviceProvider 获取服务
+            configure(option, serviceProvider);
+
+            // 验证必要的配置
+            if (option.WebSocketChannels == null || option.WebSocketChannels.Count < 1)
+            {
+                throw new InvalidOperationException("WebSocketRouteOption.WebSocketChannels must be configured. Please configure WebSocketChannels in the configure action, or call ConfigureWebSocketRoute first.");
+            }
+
+            // 如果 ApplicationServiceCollection 未设置，尝试从已注册的服务中获取
+            // 注意：如果用户完全在 UseWebSocketServer 中配置（没有调用 ConfigureWebSocketRoute），
+            // ApplicationServiceCollection 可能为 null，这通常不影响基本功能
+            // 但如果需要某些高级功能（如动态服务解析），可能需要先调用 ConfigureWebSocketRoute
+
+            // 如果之前没有注册到服务容器，我们需要通过自定义方式传递配置
+            // 由于服务容器已构建，我们使用闭包来传递配置
+            if (existingOption == null)
+            {
+                // 创建一个包装中间件，通过闭包传递配置
+                app.Use(next =>
+                {
+                    var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
+                    var logger = loggerFactory.CreateLogger<WebSocketRouteMiddleware>();
+                    var middleware = new WebSocketRouteMiddleware(next, logger, option);
+                    return middleware.Invoke;
+                });
+            }
+            else
+            {
+                // 如果已经注册，直接使用标准的中间件注册方式
+                app.UseMiddleware<WebSocketRouteMiddleware>();
+            }
+
+            WebSocketRouteOption.ApplicationServices = serviceProvider;
+
+            return app;
+        }
+
         /// <summary>
         /// Get WebSocket access address
         /// </summary>
diff --git a/Cyaim.WebSocketServer/Dashboard/Cyaim.WebSocketServer.Dashboard/Cyaim.WebSocketServer.Dashboard.csproj b/Cyaim.WebSocketServer/Dashboard/Cyaim.WebSocketServer.Dashboard/Cyaim.WebSocketServer.Dashboard.csproj
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="UTF-8" ?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
         <Authors>Psyche</Authors>
@@ -16,7 +16,7 @@
             WebSocketServer 仪表板，用于监控和管�?WebSocket 服务器和集群
         </Description>
     </PropertyGroup>
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'net10.0'">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
     <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
diff --git a/Cyaim.WebSocketServer/Sample/Cyaim.WebSocketServer.Example.Wpf/Cyaim.WebSocketServer.Example.Wpf.csproj b/Cyaim.WebSocketServer/Sample/Cyaim.WebSocketServer.Example.Wpf/Cyaim.WebSocketServer.Example.Wpf.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows</TargetFramework>
+		<TargetFrameworks>net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<EnableWindowsTargeting>true</EnableWindowsTargeting>
 		<ImplicitUsings>enable</ImplicitUsings>
diff --git a/Cyaim.WebSocketServer/Sample/Cyaim.WebSocketServer.Sample.AccessControl/Cyaim.WebSocketServer.Sample.AccessControl.csproj b/Cyaim.WebSocketServer/Sample/Cyaim.WebSocketServer.Sample.AccessControl/Cyaim.WebSocketServer.Sample.AccessControl.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/Cyaim.WebSocketServer/Sample/Cyaim.WebSocketServer.Sample.Dashboard/Cyaim.WebSocketServer.Sample.Dashboard.csproj b/Cyaim.WebSocketServer/Sample/Cyaim.WebSocketServer.Sample.Dashboard/Cyaim.WebSocketServer.Sample.Dashboard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/Cyaim.WebSocketServer/Sample/Cyaim.WebSocketServer.Sample.Dashboard/Program.cs b/Cyaim.WebSocketServer/Sample/Cyaim.WebSocketServer.Sample.Dashboard/Program.cs
@@ -7,6 +7,7 @@
 using Cyaim.WebSocketServer.Sample.Dashboard.Interfaces;
 using Cyaim.WebSocketServer.Sample.Dashboard.Services;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -162,7 +163,31 @@
 };
 
 app.UseWebSockets(webSocketOptions);
-app.UseWebSocketServer();
+
+// 方式一：使用原有的配置方式（在 ConfigureWebSocketRoute 中配置）
+// app.UseWebSocketServer();
+
+// 方式二：在中间件配置时进行配置（推荐，可以直接从容器获取服务）
+// 这种方式更友好，特别是当需要从容器中获取其他服务时
+app.UseWebSocketServer((option, services) =>
+{
+    // 此时可以直接从 services 获取已注册的服务，无需手动创建 ServiceProvider
+    var logger = services.GetRequiredService<ILogger<Program>>();
+    var configuration = services.GetRequiredService<IConfiguration>();
+    var httpClientFactory = services.GetRequiredService<IHttpClientFactory>();
+    
+    // 如果需要，可以在这里重新配置或补充配置
+    // 例如：如果需要根据运行时信息动态配置
+    var clusterConfig = configuration.GetSection("Cluster");
+    if (clusterConfig.Exists() && !string.IsNullOrEmpty(clusterConfig["NodeId"]))
+    {
+        logger.LogInformation("集群模式已启用");
+    }
+    
+    // 注意：如果之前在 ConfigureWebSocketRoute 中已经配置了基本选项（如 WebSocketChannels），
+    // 这里可以只进行补充配置。如果之前没有配置，需要在这里完成所有配置。
+    // 为了演示，这里假设已经在 ConfigureWebSocketRoute 中配置了基本选项
+});
 
 // 配置并启动集群（如果配置了集群）
 var clusterConfig = app.Configuration.GetSection("Cluster");
diff --git a/Cyaim.WebSocketServer/TestAOT/TestAOT.csproj b/Cyaim.WebSocketServer/TestAOT/TestAOT.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
