diff --git a/IRaCIS.Core.API/SignalRHub/UploadHub.cs b/IRaCIS.Core.API/SignalRHub/UploadHub.cs index 6a23c7b14..45c8fee50 100644 --- a/IRaCIS.Core.API/SignalRHub/UploadHub.cs +++ b/IRaCIS.Core.API/SignalRHub/UploadHub.cs @@ -1,13 +1,15 @@ 锘縰sing EasyCaching.Core; +using IRaCIS.Core.Domain.Share; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Logging; using System.Threading.Tasks; namespace IRaCIS.Core.API { public interface IUploadClient { - Task ReceivProgressAsync( string studyInstanceUid , int haveReceivedCount); + Task ReceivProgressAsync(string studyInstanceUid, int haveReceivedCount); } @@ -15,16 +17,23 @@ namespace IRaCIS.Core.API [AllowAnonymous] public class UploadHub : Hub { - //private IEasyCachingProvider _provider { get; } - //public UploadHub(IEasyCachingProvider provider) - //{ - // _provider = provider; - //} + public ILogger _logger { get; set; } + public IUserInfo _userInfo { get; set; } + public UploadHub(IUserInfo userInfo, ILogger logger) + { + _userInfo = userInfo; + + _logger = logger; + } public override Task OnConnectedAsync() { //base.Context.User.id + var a = Context.User.Identity; + var b = _userInfo.Id; + + _logger.LogError("杩炴帴: " + Context.ConnectionId); return base.OnConnectedAsync(); } diff --git a/IRaCIS.Core.API/Startup.cs b/IRaCIS.Core.API/Startup.cs index ee657b202..c10899168 100644 --- a/IRaCIS.Core.API/Startup.cs +++ b/IRaCIS.Core.API/Startup.cs @@ -228,7 +228,8 @@ namespace IRaCIS.Core.API //文件伺服 必须带Token 访问 //app.UseIRacisHostStaticFileStore(env); - app.UseCors(); + app.UseCors(t => t.WithOrigins(new string[] { "null" }).AllowAnyMethod().AllowAnyHeader().AllowCredentials()); + app.UseEndpoints(endpoints => { endpoints.MapHub("/UploadHub" ).RequireCors(t=>t.WithOrigins(new string[] {"null"}).AllowAnyMethod().AllowAnyHeader().AllowCredentials());