From aafc679e45cabe204a4ca852ae82395e6621eb4f Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 18 Mar 2026 15:36:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=B4=E6=97=B6token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Helper/OSSService.cs | 24 ++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs index 166f810a6..d600988e6 100644 --- a/IRaCIS.Core.Application/Helper/OSSService.cs +++ b/IRaCIS.Core.Application/Helper/OSSService.cs @@ -1860,6 +1860,8 @@ public class OSSService(IOptionsMonitor options, public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null) { + + string objectStoreUse = string.Empty; //如果传递了域名，并且打开了存储同步，根据域名使用的具体存储覆盖之前的配置，否则就用固定的配置 if (ObjectStoreServiceOptions.IsOpenStoreSync && domain.IsNotNullOrEmpty()) { @@ -1868,13 +1870,17 @@ public class OSSService(IOptionsMonitor options, var find = ObjectStoreServiceOptions.SyncConfigList.FirstOrDefault(t => t.Domain == userDomain); if (find != null) { - ObjectStoreServiceOptions.ObjectStoreUse = find.Primary; + objectStoreUse = find.Primary; } } + else + { + objectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse; + } - var objectStoreDTO = new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, IsOpenStoreSync = ObjectStoreServiceOptions.IsOpenStoreSync, SyncConfigList = ObjectStoreServiceOptions.SyncConfigList }; + var objectStoreDTO = new ObjectStoreDTO() { ObjectStoreUse = objectStoreUse, IsOpenStoreSync = ObjectStoreServiceOptions.IsOpenStoreSync, SyncConfigList = ObjectStoreServiceOptions.SyncConfigList }; - if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS" || isGetAllTempToken == true) + if (objectStoreUse == "AliyunOSS" || isGetAllTempToken == true) { var ossOptions = ObjectStoreServiceOptions.AliyunOSS; @@ -1922,11 +1928,11 @@ public class OSSService(IOptionsMonitor options, objectStoreDTO.AliyunOSS = tempToken; } - if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO") + if (objectStoreUse == "MinIO") { objectStoreDTO.MinIO = ObjectStoreServiceOptions.MinIO; } - if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS" || isGetAllTempToken == true) + if (objectStoreUse == "AWS" || isGetAllTempToken == true) { var awsOptions = ObjectStoreServiceOptions.AWS; @@ -1972,6 +1978,10 @@ public class OSSService(IOptionsMonitor options, objectStoreDTO.AWS = tempToken; } + if (objectStoreUse.IsNullOrEmpty()) + { + throw new BusinessValidationFailedException("未定义的存储介质类型"); + } return objectStoreDTO; } @@ -2063,10 +2073,6 @@ public class OSSService(IOptionsMonitor options, throw new BusinessValidationFailedException("未定义的同步类型"); } } - catch (Exception ex) - { - Log.Error($"同步错误:{ex.Message}"); - } finally { // ⭐⭐⭐ 真正释放 HTTP 连接 From e0bf859cb2c01afd55e7432a37c15894bff1fa76 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 18 Mar 2026 15:39:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=BE=E5=BC=80=E9=9D=9E=E8=82=BF?= =?UTF-8?q?=E7=98=A4CDISC=E5=AF=BC=E5=87=BA=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/Export/ExcelExportService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs index 73a1a527a..e6dd8c787 100644 --- a/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs @@ -2774,7 +2774,7 @@ namespace IRaCIS.Core.Application.Service.Common { list.Add(new ExportDocumentDes() { Code = StaticData.Export.IVUS_CDISC_Export, ExportCatogory = ExportResult.IVUS_CDISC_Export }); } - if (criterion.CriterionGroup != CriterionGroup.Tumor && criterion.CriterionType != CriterionType.OCT && criterion.CriterionType != CriterionType.IVUS) + if (criterion.CriterionGroup != CriterionGroup.Tumor /*&& criterion.CriterionType != CriterionType.OCT && criterion.CriterionType != CriterionType.IVUS*/) { list.Add(new ExportDocumentDes() { Code = StaticData.Export.CDISC_Reading_Export, ExportCatogory = ExportResult.NoneTumorCDISC }); } From 3813b93dc599ac905a8dc6544974ab4571ab9fa3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 18 Mar 2026 17:36:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=9F=E4=B8=80aws=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRC.Core.Dicom/Service/OSSService.cs | 20 +++++++++---------- IRC.Core.SCP/Service/OSSService.cs | 16 +++++++-------- IRaCIS.Core.Application/Helper/OSSService.cs | 16 +++++++-------- .../IRaCIS.Core.Application.xml | 7 +++++++ 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/IRC.Core.Dicom/Service/OSSService.cs b/IRC.Core.Dicom/Service/OSSService.cs index 1ac5e80ee..fe6138055 100644 --- a/IRC.Core.Dicom/Service/OSSService.cs +++ b/IRC.Core.Dicom/Service/OSSService.cs @@ -231,8 +231,8 @@ public class OSSService : IOSSService //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -320,8 +320,8 @@ public class OSSService : IOSSService //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -397,8 +397,8 @@ public class OSSService : IOSSService //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -493,8 +493,8 @@ public class OSSService : IOSSService //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -625,8 +625,8 @@ public class OSSService : IOSSService //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); diff --git a/IRC.Core.SCP/Service/OSSService.cs b/IRC.Core.SCP/Service/OSSService.cs index efea4770a..7657d8c51 100644 --- a/IRC.Core.SCP/Service/OSSService.cs +++ b/IRC.Core.SCP/Service/OSSService.cs @@ -535,8 +535,8 @@ public class OSSService(IOptionsMonitor options, var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region), - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; using var client = new AmazonS3Client(credentials, clientConfig); @@ -715,8 +715,8 @@ public class OSSService(IOptionsMonitor options, //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -1134,8 +1134,8 @@ public class OSSService(IOptionsMonitor options, var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -1391,8 +1391,8 @@ public class OSSService(IOptionsMonitor options, var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs index d600988e6..b17bc2615 100644 --- a/IRaCIS.Core.Application/Helper/OSSService.cs +++ b/IRaCIS.Core.Application/Helper/OSSService.cs @@ -537,8 +537,8 @@ public class OSSService(IOptionsMonitor options, var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region), - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; using var client = new AmazonS3Client(credentials, clientConfig); @@ -717,8 +717,8 @@ public class OSSService(IOptionsMonitor options, //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -1136,8 +1136,8 @@ public class OSSService(IOptionsMonitor options, var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -1393,8 +1393,8 @@ public class OSSService(IOptionsMonitor options, var clientConfig = new AmazonS3Config { - RegionEndpoint = RegionEndpoint.USEast1, - UseHttp = true, + RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region) + //,UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 27498f331..e92c01ef6 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -7573,6 +7573,13 @@ 影像阅片临床数据签名 + + + 修改临床数据后 将签名状态变更为未签名 + + + + 获取访视临床数据名称