diff --git a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs index 56acee2..a8caab5 100644 --- a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs +++ b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs @@ -82,7 +82,7 @@ namespace ZR.Admin.WebApi.Extensions /// /// /// - public static string GetName(this HttpContext context) + public static string? GetName(this HttpContext context) { var uid = context.User?.Identity?.Name; diff --git a/ZR.Admin.WebApi/Hubs/MessageHub.cs b/ZR.Admin.WebApi/Hubs/MessageHub.cs index b48ff74..e06644e 100644 --- a/ZR.Admin.WebApi/Hubs/MessageHub.cs +++ b/ZR.Admin.WebApi/Hubs/MessageHub.cs @@ -38,7 +38,7 @@ namespace ZR.Admin.WebApi.Hubs /// public override Task OnConnectedAsync() { - var name = Context.User.Identity.Name; + var name = HttpContextExtension.GetName(App.HttpContext);// Context.User.Identity.Name; var ip = HttpContextExtension.GetClientUserIp(App.HttpContext); var ip_info = IpTool.Search(ip); @@ -66,7 +66,7 @@ namespace ZR.Admin.WebApi.Hubs /// 连接终止时调用。 /// /// - public override Task OnDisconnectedAsync(Exception exception) + public override Task OnDisconnectedAsync(Exception? exception) { var user = clientUsers.Where(p => p.ConnnectionId == Context.ConnectionId).FirstOrDefault(); //判断用户是否存在,否则添加集合 diff --git a/ZR.Admin.WebApi/Program.cs b/ZR.Admin.WebApi/Program.cs index 529a269..30b1dab 100644 --- a/ZR.Admin.WebApi/Program.cs +++ b/ZR.Admin.WebApi/Program.cs @@ -19,13 +19,14 @@ builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); //注入HttpContextAccessor builder.Services.AddSingleton(); +var corsUrls = builder.Configuration["corsUrls"]?.Split(',', StringSplitOptions.RemoveEmptyEntries); //配置跨域 builder.Services.AddCors(c => { c.AddPolicy("Policy", policy => { - policy.WithOrigins(builder.Configuration["corsUrls"].Split(',', StringSplitOptions.RemoveEmptyEntries)) + policy.WithOrigins(corsUrls == null ? Array.Empty() : corsUrls) .AllowAnyHeader()//允许任意头 .AllowCredentials()//允许cookie .AllowAnyMethod();//允许任意方法