HIR 推送影像bug 修改到IRC 测试
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-02-08 09:33:29 +08:00
parent 91471dee13
commit 70e0a1325a
2 changed files with 19 additions and 12 deletions

View File

@ -126,16 +126,22 @@ builder.Services.Configure<ForwardedHeadersOptions>(options =>
ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto; ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
}); });
builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManager>()
//.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
.AddImageManager<ImageSharpImageManager>();
//Dicom影像渲染图片 跨平台 //Dicom影像渲染图片 跨平台
//builder.Services.AddDicomSetup(); //builder.Services.AddDicomSetup();
new DicomSetupBuilder() //new DicomSetupBuilder()
.RegisterServices(s => // .RegisterServices(s =>
s.AddFellowOakDicom() // s.AddFellowOakDicom()
.AddTranscoderManager<NativeTranscoderManager>() // .AddTranscoderManager<NativeTranscoderManager>()
//.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>() // //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
.AddImageManager<ImageSharpImageManager>()) // .AddImageManager<ImageSharpImageManager>())
.SkipValidation() // .SkipValidation()
.Build(); // .Build();
@ -211,6 +217,8 @@ else
#endregion #endregion
DicomSetupBuilder.UseServiceProvider(app.Services);
var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>(); var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>();
var server = DicomServerFactory.Create<CStoreSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services,logger: logger); var server = DicomServerFactory.Create<CStoreSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services,logger: logger);

View File

@ -76,9 +76,10 @@ namespace IRaCIS.Core.SCP.Service
}; };
public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies) public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies, IServiceProvider injectServiceProvider)
: base(stream, fallbackEncoding, log, dependencies) : base(stream, fallbackEncoding, log, dependencies)
{ {
_serviceProvider = injectServiceProvider.CreateScope().ServiceProvider;
} }
@ -92,9 +93,7 @@ namespace IRaCIS.Core.SCP.Service
Log.Logger.Warning($"接收到来自{association.CallingAE}的连接"); Log.Logger.Warning($"接收到来自{association.CallingAE}的连接");
_serviceProvider = (IServiceProvider)this.UserState; //_serviceProvider = (IServiceProvider)this.UserState;
var _trialDicomAERepository = _serviceProvider.GetService<IRepository<TrialDicomAE>>(); var _trialDicomAERepository = _serviceProvider.GetService<IRepository<TrialDicomAE>>();