From e02fa28cd0ffcffa9a2005e250e6a38c1a626aee Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 5 Mar 2025 13:12:48 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9EDicom=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/NoneDicomStudyService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs index f82a373c9..7cff7eb9d 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs @@ -54,7 +54,7 @@ namespace IRaCIS.Core.Application.Contracts } - var list = await noneDicomStudyQueryable.ToListAsync(); + var list = await noneDicomStudyQueryable.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync(); var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync(); return ResponseOutput.Ok(list, config) ; From c036aab9c4b615a0c46be37cdc894317452eddf3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 24 Mar 2025 17:12:04 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9refer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LegacyController/TrialGlobalLimitActionFilter.cs | 4 ++-- .../MinimalAPI/TrialGlobalLimitEndpointFilter.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/BusinessFilter/LegacyController/TrialGlobalLimitActionFilter.cs b/IRaCIS.Core.Application/BusinessFilter/LegacyController/TrialGlobalLimitActionFilter.cs index e845a10c4..8d24d2591 100644 --- a/IRaCIS.Core.Application/BusinessFilter/LegacyController/TrialGlobalLimitActionFilter.cs +++ b/IRaCIS.Core.Application/BusinessFilter/LegacyController/TrialGlobalLimitActionFilter.cs @@ -62,9 +62,9 @@ public class TrialGlobalLimitActionFilter(IFusionCache _fusionCache, IUserInfo _ var index = context.HttpContext.Request.RouteValues.Keys.ToList().IndexOf("trialId"); trialIdStr = context.HttpContext.Request.RouteValues.Values.ToList()[index] as string; } - else if (context.HttpContext.Request.Headers["self-Referer"].ToString().Contains("trialId")) + else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId")) { - var headerStr = context.HttpContext.Request.Headers["self-Referer"].ToString(); + var headerStr = context.HttpContext.Request.Headers["Referer"].ToString(); var trialIdIndex = headerStr.IndexOf("trialId"); diff --git a/IRaCIS.Core.Application/BusinessFilter/MinimalAPI/TrialGlobalLimitEndpointFilter.cs b/IRaCIS.Core.Application/BusinessFilter/MinimalAPI/TrialGlobalLimitEndpointFilter.cs index bb1974ff0..6648db25e 100644 --- a/IRaCIS.Core.Application/BusinessFilter/MinimalAPI/TrialGlobalLimitEndpointFilter.cs +++ b/IRaCIS.Core.Application/BusinessFilter/MinimalAPI/TrialGlobalLimitEndpointFilter.cs @@ -71,9 +71,9 @@ public class TrialGlobalLimitEndpointFilter(IFusionCache _fusionCache, IUserInfo var index = context.HttpContext.Request.RouteValues.Keys.ToList().IndexOf("trialId"); trialIdStr = context.HttpContext.Request.RouteValues.Values.ToList()[index] as string; } - else if (context.HttpContext.Request.Headers["self-Referer"].ToString().Contains("trialId")) + else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId")) { - var headerStr = context.HttpContext.Request.Headers["self-Referer"].ToString(); + var headerStr = context.HttpContext.Request.Headers["Referer"].ToString(); var trialIdIndex = headerStr.IndexOf("trialId"); From 5f0643d4d47dc9e86829b059f6ee7475b14a2465 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 26 Mar 2025 14:22:26 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9swagger=20=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Progranm.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index c4a6b4528..c90e0a5f1 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -39,7 +39,7 @@ var enviromentName = config["ASPNETCORE_ENVIRONMENT"]; var openSwaggerStr = config["ASPNETCORE_OpenSwagger"]; -var isOpenSwagger= openSwaggerStr == null&& openSwaggerStr?.ToLower()=="true"; +var isOpenSwagger= openSwaggerStr == null|| openSwaggerStr?.ToLower()=="true"; if (string.IsNullOrWhiteSpace(enviromentName)) From 24bfb4920cd074c3439f9e201e45bfba7cdfecf4 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 3 Apr 2025 11:29:13 +0800 Subject: [PATCH 4/9] =?UTF-8?q?IQC=E5=9B=9E=E9=80=80=E5=88=B0CRC=20?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.Event_IRC.json | 4 +- .../IRaCIS.Core.Application.xml | 10 +++ IRaCIS.Core.Application/TestService.cs | 82 +++++++++++++++++++ 3 files changed, 94 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.Event_IRC.json b/IRaCIS.Core.API/appsettings.Event_IRC.json index a5e5925ca..67ccf7b7b 100644 --- a/IRaCIS.Core.API/appsettings.Event_IRC.json +++ b/IRaCIS.Core.API/appsettings.Event_IRC.json @@ -7,8 +7,8 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=47.117.164.182,1434;Database=Event_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true", - "Hangfire": "Server=47.117.164.182,1434;Database=Event_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true" + "RemoteNew": "Server=101.132.253.119,1435;Database=irc_Prpd_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true", + "Hangfire": "Server=101.132.253.119,1435;Database=irc_Hangfire_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true" }, "ObjectStoreService": { "ObjectStoreUse": "AliyunOSS", diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 30bf040a5..7df328020 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -13523,6 +13523,16 @@ + + + IQC 回退到影像上传 + + + + + + + 非dicom 临床数据 diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 29327555a..2b916b3d0 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -7,6 +7,7 @@ using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Service.BusinessFilter; using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Domain; +using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infra.EFCore; using IRaCIS.Core.Infrastructure; @@ -86,6 +87,87 @@ namespace IRaCIS.Core.Application.Service await _readingConsistentClinicalDataRepository.SaveChangesAsync(); return ResponseOutput.Ok(); } + + + /// + /// IQC 回退到影像上传 + /// + /// + /// + /// + /// + /// + [AllowAnonymous] + [HttpPost] + public async Task IQCBackToUpload(Guid[] subjectVisitIdList, + [FromServices] IRepository _subjectVisitRepository, + [FromServices] IRepository _trialQCQuestionAnswerRepository, + [FromServices] IRepository _readingClinicalDataReposiotry) + { + + foreach (var subjectVisitId in subjectVisitIdList) + { + var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException(); + + + //需要重新产生任务 + sv.IsVisitTaskGenerated = false; + sv.IsPMBackOrReReading = true; + + sv.AuditState = AuditStateEnum.None; + sv.SubmitState = SubmitStateEnum.ToSubmit; + sv.ReadingStatus = ReadingStatusEnum.ImageNotSubmit; + + //回退后，回退状态恢复 + sv.RequestBackState = RequestBackStateEnum.NotRequest; + sv.IsCheckBack = false; + sv.CheckBackTime = null; + sv.CheckState = CheckStateEnum.None; + sv.CheckChallengeState = CheckChanllengeTypeEnum.None; + + sv.SVENDTC = null; + sv.SVSTDTC = null; + + sv.PreliminaryAuditTime = null; + sv.SubmitTime = null; + sv.ReviewAuditTime = null; + sv.CurrentActionUserExpireTime = null; + + + sv.IsTake = false; + sv.CurrentActionUserId = null; + sv.PreliminaryAuditUserId = null; + sv.ReviewAuditUserId = null; + + + if (sv.IsBaseLine) + { + await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id && (t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit), c => new ReadingClinicalData() { IsSign = false, ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded }); + + } + else + { + await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id && t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit, c => new ReadingClinicalData() + { + IsSign = false, + ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded, + IsBlind = null, + IsComplete = null + }); + } + + + await _trialQCQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId); + } + + + + var success = await _subjectVisitRepository.SaveChangesAsync(); + + return ResponseOutput.Ok(); + + } + public async Task DeleteOSSDate(string rootFolder, [FromServices] IOSSService _oSSService, [FromServices] IWebHostEnvironment _hostEnvironment) { From e9e5075c1c810bf4b5b71414c1483fc35a2973b6 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 3 Apr 2025 13:49:34 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=BC=A9=E7=95=A5=E5=9B=BE=E6=B5=8B=E8=AF=95?= =?UTF-8?q?ok=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Helper/OtherTool/ImageHelper.cs | 14 ++-- IRaCIS.Core.Application/TestService.cs | 66 ++++++++++++++++++- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs b/IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs index 293511f2d..83843f400 100644 --- a/IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs +++ b/IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs @@ -15,14 +15,20 @@ public static class ImageHelper fileStorePath = fileStorePath ?? filePath + ".preview.jpeg"; - using (var image = SixLabors.ImageSharp.Image.Load(filePath)) - { + // 读取 DICOM 文件 + var dicomImage = new DicomImage(filePath); + // 渲染 DICOM 图像到 ImageSharp 格式 + using (var image = dicomImage.RenderImage().AsSharpImage()) + { + // 生成缩略图（调整大小） image.Mutate(x => x.Resize(500, 500)); - image.Save(fileStorePath); - + // 保存缩略图为 JPEG + image.Save(fileStorePath, new JpegEncoder()); } + + } diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 2b916b3d0..6a53400fd 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -1,5 +1,6 @@ using Aliyun.OSS; using DocumentFormat.OpenXml.Spreadsheet; +using FellowOakDicom.Imaging; using IRaCIS.Application.Contracts; using IRaCIS.Core.Application.BusinessFilter; using IRaCIS.Core.Application.Contracts; @@ -27,8 +28,13 @@ using Microsoft.Extensions.Options; using MiniExcelLibs; using NPOI.SS.Formula.Functions; using NPOI.XWPF.UserModel; +using SharpCompress.Common; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats.Jpeg; +using SixLabors.ImageSharp.Processing; using System.Globalization; using System.Linq.Dynamic.Core; +using System.Reactive.Subjects; using System.Reflection.Metadata.Ecma335; using System.Runtime.InteropServices; using System.Text; @@ -54,6 +60,7 @@ namespace IRaCIS.Core.Application.Service IRepository _dicomSeriesRepository, IRepository _userRoleRepository, IRepository _trialBodyPartRepository, + IOSSService _IOSSService, IDistributedLockProvider _distributedLockProvider, ILogger _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { @@ -160,7 +167,7 @@ namespace IRaCIS.Core.Application.Service await _trialQCQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId); } - + var success = await _subjectVisitRepository.SaveChangesAsync(); @@ -168,6 +175,63 @@ namespace IRaCIS.Core.Application.Service } + + + /// + /// 后端处理某个中心缩略图有问题 先下载，生成缩略图上传，然后更新数据库 + /// + /// + [AllowAnonymous] + public async Task BackImageResize(Guid trialSiteId ,Guid subjectId/* , [FromServices] IRepository<>*/) + { + ///${params.trialId}/ Image /${params.subjectId}/${params.subjectVisitId}/${ dicomInfo.studyUid}/${ v.seriesUid}.jpg + + var dealSeriesList = await _dicomSeriesRepository.Where(t => t.DicomStudy.Subject.TrialSiteId == trialSiteId && t.SubjectId== subjectId).Select(t => new { t.Id, t.SubjectId, t.TrialId, t.SubjectVisitId, t.StudyInstanceUid, t.SeriesInstanceUid, t.ImageResizePath, t.UpdateUserId, FirstInstancePath = t.DicomInstanceList.First().Path }).ToListAsync(); + + //下载到本地 + string tempFolderPath = Path.Combine(Directory.GetCurrentDirectory(), $"DownloadTemp_{NewId.NextGuid()}"); + Directory.CreateDirectory(tempFolderPath); + + foreach (var dealSeries in dealSeriesList) + { + var fileName = Path.GetFileNameWithoutExtension(dealSeries.FirstInstancePath); + + var localFilePath = Path.Combine(tempFolderPath, fileName); + + await _IOSSService.DownLoadFromOSSAsync(dealSeries.FirstInstancePath, localFilePath); + + + var resizePath = localFilePath + "_New.jpg"; + + //生成缩略图 + + // 读取 DICOM 文件 + var dicomImage = new DicomImage(localFilePath); + + + // 渲染 DICOM 图像到 ImageSharp 格式 + using (var image = dicomImage.RenderImage().AsSharpImage()) + { + // 生成缩略图（调整大小） + image.Mutate(x => x.Resize(500, 500)); + + // 保存缩略图为 JPEG + image.Save(resizePath, new JpegEncoder()); + } + + var ossFolder = $"{dealSeries.TrialId}/Image/{dealSeries.SubjectId}/{dealSeries.SubjectVisitId}/{dealSeries.StudyInstanceUid}"; + + var relativePath = await _IOSSService.UploadToOSSAsync(resizePath, ossFolder, false); + + await _dicomSeriesRepository.BatchUpdateNoTrackingAsync(t => t.Id == dealSeries.Id, u => new DicomSeries() { ImageResizePath = relativePath, UpdateUserId = dealSeries.UpdateUserId }); + + } + + return ResponseOutput.Ok(); + + } + + public async Task DeleteOSSDate(string rootFolder, [FromServices] IOSSService _oSSService, [FromServices] IWebHostEnvironment _hostEnvironment) { From 2b11042f3573eb1aef20e243d7e7ee418ec1ff60 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 3 Apr 2025 14:04:28 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7fo-dicom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/IRaCIS.Core.API.csproj | 1 - IRaCIS.Core.API/Progranm.cs | 3 +-- .../LogDashboard/LogDashBoardAuthFilter.cs | 26 +++++++++---------- .../IRaCIS.Core.Application.csproj | 12 ++++----- .../IRaCIS.Core.Application.xml | 8 +++++- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index 8ddb0f03d..ae376801d 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -80,7 +80,6 @@ - diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index c90e0a5f1..cf2b4de2e 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -7,7 +7,6 @@ using IRaCIS.Core.Application.Service; using IRaCIS.Core.Application.Service.BusinessFilter; using IRaCIS.Core.Infra.EFCore; using IRaCIS.Core.Infrastructure.Extention; -using LogDashboard; using MassTransit; using MassTransit.NewIdProviders; using Microsoft.AspNetCore.Builder; @@ -221,7 +220,7 @@ app.UseResponseCompression(); app.UseStaticFiles(); //LogDashboard -app.UseLogDashboard("/LogDashboard"); +//app.UseLogDashboard("/LogDashboard"); //hangfire app.UseHangfireConfig(env); diff --git a/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs b/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs index b644df0e3..f75dbf96a 100644 --- a/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs +++ b/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs @@ -1,15 +1,15 @@ -using LogDashboard; -using LogDashboard.Authorization; +//using LogDashboard; +//using LogDashboard.Authorization; -namespace IRaCIS.Core.API.Filter -{ +//namespace IRaCIS.Core.API.Filter +//{ - public class LogDashBoardAuthFilter : ILogDashboardAuthorizationFilter - { - //在此可以利用 本系统的UerTypeEnum 判断 - public bool Authorization(LogDashboardContext context) - { - return context.HttpContext.User.Identity.IsAuthenticated; - } - } -} \ No newline at end of file +// public class LogDashBoardAuthFilter : ILogDashboardAuthorizationFilter +// { +// //在此可以利用 本系统的UerTypeEnum 判断 +// public bool Authorization(LogDashboardContext context) +// { +// return context.HttpContext.User.Identity.IsAuthenticated; +// } +// } +//} \ No newline at end of file diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj index cee4a0855..3ab94f632 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj @@ -37,16 +37,16 @@ - + - - - + + + @@ -54,14 +54,14 @@ - + true - + diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 87ea8de6a..0917362b4 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1389,7 +1389,7 @@ - + 稽查文档 @@ -13898,6 +13898,12 @@ + + + 后端处理某个中心缩略图有问题 先下载，生成缩略图上传，然后更新数据库 + + + 非dicom 临床数据 From 5e36054ee9c5ce5d2b14df66290090903d7c9e6a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 3 Apr 2025 14:17:24 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=A0=E9=99=A4logdashboard=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=B8=8Bfo-dicom=20=E5=B8=B8=E8=A7=81=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRC.Core.SCP/IRC.Core.SCP.csproj | 6 +-- IRaCIS.Core.API/Progranm.cs | 2 +- .../_ServiceExtensions/LogDashboardSetup.cs | 38 +++++++++---------- .../IRaCIS.Core.Infra.EFCore.csproj | 4 +- .../IRaCIS.Core.Infrastructure.csproj | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/IRC.Core.SCP/IRC.Core.SCP.csproj b/IRC.Core.SCP/IRC.Core.SCP.csproj index 768c65fef..311016000 100644 --- a/IRC.Core.SCP/IRC.Core.SCP.csproj +++ b/IRC.Core.SCP/IRC.Core.SCP.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index cf2b4de2e..ae03f93a3 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -135,7 +135,7 @@ builder.Services.AddFusionCache(); builder.Services.AddhangfireSetup(_configuration); //Serilog 日志可视化 LogDashboard日志 -builder.Services.AddLogDashboardSetup(); +//builder.Services.AddLogDashboardSetup(); //Dicom影像渲染图片 跨平台 builder.Services.AddDicomSetup(); diff --git a/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs index 208d0672b..3a4912ea8 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs @@ -1,25 +1,25 @@  -using LogDashboard; -using Microsoft.Extensions.DependencyInjection; +//using LogDashboard; +//using Microsoft.Extensions.DependencyInjection; -namespace IRaCIS.Core.API -{ - public static class LogDashboardSetup - { - public static void AddLogDashboardSetup(this IServiceCollection services) - { - //IIS 配置虚拟路径部署，会出现IIS静态文件404 - services.AddLogDashboard(opt => - { - //opt.PathMatch = "/api/LogDashboard"; - opt.PathMatch = "/LogDashboard"; +//namespace IRaCIS.Core.API +//{ +// public static class LogDashboardSetup +// { +// public static void AddLogDashboardSetup(this IServiceCollection services) +// { +// //IIS 配置虚拟路径部署，会出现IIS静态文件404 +// services.AddLogDashboard(opt => +// { +// //opt.PathMatch = "/api/LogDashboard"; +// opt.PathMatch = "/LogDashboard"; - //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018")); +// //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018")); - //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter()); +// //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter()); - }); +// }); - } - } -} +// } +// } +//} diff --git a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj index 383747676..9800d62b0 100644 --- a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj +++ b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj @@ -21,7 +21,7 @@ - + @@ -30,7 +30,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj index cac011aba..4e4acb358 100644 --- a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj +++ b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj @@ -18,7 +18,7 @@ - + From ab00d64725651d76e61abe118ca981da7b5bdb96 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 3 Apr 2025 14:23:42 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E5=BA=9F=E5=BC=83=E5=8C=85=E6=8D=A2=E7=94=A8=E5=BE=AE?= =?UTF-8?q?=E8=BD=AF=E6=96=B0=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/IRaCIS.Core.API.csproj | 2 +- IRaCIS.Core.Test/IRaCIS.Core.Test.csproj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index ae376801d..2247700bf 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -69,6 +69,7 @@ + all @@ -79,7 +80,6 @@ - diff --git a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj index ee616207e..a8e322f7c 100644 --- a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj +++ b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj @@ -49,11 +49,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 6d9b5fdb2d4e49febe66628c1f8b7337ee795a86 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 3 Apr 2025 14:26:11 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=99=8D=E7=BA=A7=E4=B8=BA8=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Test/IRaCIS.Core.Test.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj index a8e322f7c..de2af024c 100644 --- a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj +++ b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj @@ -52,8 +52,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive