XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
Hewt 2026-03-19 10:14:03 +08:00
parent 3beac6177f 3813b93dc5
commit 52d1575890
4 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IRC.Core.Dicom/Service/OSSService.cs
View File

@ -231,8 +231,8 @@ public class OSSService : IOSSService
//提供awsEndPoint（域名）进行访问配置 //提供awsEndPoint（域名）进行访问配置
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -320,8 +320,8 @@ public class OSSService : IOSSService
//提供awsEndPoint（域名）进行访问配置 //提供awsEndPoint（域名）进行访问配置
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -397,8 +397,8 @@ public class OSSService : IOSSService
//提供awsEndPoint（域名）进行访问配置 //提供awsEndPoint（域名）进行访问配置
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -493,8 +493,8 @@ public class OSSService : IOSSService
//提供awsEndPoint（域名）进行访问配置 //提供awsEndPoint（域名）进行访问配置
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -625,8 +625,8 @@ public class OSSService : IOSSService
//提供awsEndPoint（域名）进行访问配置 //提供awsEndPoint（域名）进行访问配置
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);

16
IRC.Core.SCP/Service/OSSService.cs
View File

@ -535,8 +535,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region), RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
using var client = new AmazonS3Client(credentials, clientConfig); using var client = new AmazonS3Client(credentials, clientConfig);
@ -715,8 +715,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
//提供awsEndPoint（域名）进行访问配置 //提供awsEndPoint（域名）进行访问配置
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -1134,8 +1134,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -1391,8 +1391,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);

40
IRaCIS.Core.Application/Helper/OSSService.cs
View File

@ -537,8 +537,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region), RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
using var client = new AmazonS3Client(credentials, clientConfig); using var client = new AmazonS3Client(credentials, clientConfig);
@ -717,8 +717,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
//提供awsEndPoint（域名）进行访问配置 //提供awsEndPoint（域名）进行访问配置
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -1136,8 +1136,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -1393,8 +1393,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
var clientConfig = new AmazonS3Config var clientConfig = new AmazonS3Config
{ {
RegionEndpoint = RegionEndpoint.USEast1, RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
UseHttp = true, //,UseHttp = true,
}; };
var amazonS3Client = new AmazonS3Client(credentials, clientConfig); var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@ -1860,6 +1860,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null) public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null)
{ {
string objectStoreUse = string.Empty;
//如果传递了域名，并且打开了存储同步，根据域名使用的具体存储覆盖之前的配置，否则就用固定的配置 //如果传递了域名，并且打开了存储同步，根据域名使用的具体存储覆盖之前的配置，否则就用固定的配置
if (ObjectStoreServiceOptions.IsOpenStoreSync && domain.IsNotNullOrEmpty()) if (ObjectStoreServiceOptions.IsOpenStoreSync && domain.IsNotNullOrEmpty())
{ {
@ -1868,13 +1870,17 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
var find = ObjectStoreServiceOptions.SyncConfigList.FirstOrDefault(t => t.Domain == userDomain); var find = ObjectStoreServiceOptions.SyncConfigList.FirstOrDefault(t => t.Domain == userDomain);
if (find != null) 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; var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
@ -1922,11 +1928,11 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
objectStoreDTO.AliyunOSS = tempToken; objectStoreDTO.AliyunOSS = tempToken;
} }
if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO") if (objectStoreUse == "MinIO")
{ {
objectStoreDTO.MinIO = ObjectStoreServiceOptions.MinIO; objectStoreDTO.MinIO = ObjectStoreServiceOptions.MinIO;
} }
if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS" || isGetAllTempToken == true) if (objectStoreUse == "AWS" || isGetAllTempToken == true)
{ {
var awsOptions = ObjectStoreServiceOptions.AWS; var awsOptions = ObjectStoreServiceOptions.AWS;
@ -1972,6 +1978,10 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
objectStoreDTO.AWS = tempToken; objectStoreDTO.AWS = tempToken;
} }
if (objectStoreUse.IsNullOrEmpty())
{
throw new BusinessValidationFailedException("未定义的存储介质类型");
}
return objectStoreDTO; return objectStoreDTO;
} }
@ -2063,10 +2073,6 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
throw new BusinessValidationFailedException("未定义的同步类型"); throw new BusinessValidationFailedException("未定义的同步类型");
} }
} }
catch (Exception ex)
{
Log.Error($"同步错误:{ex.Message}");
}
finally finally
{ {
// ⭐⭐⭐ 真正释放 HTTP 连接 // ⭐⭐⭐ 真正释放 HTTP 连接

2
IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs
View File

@ -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 }); 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 }); list.Add(new ExportDocumentDes() { Code = StaticData.Export.CDISC_Reading_Export, ExportCatogory = ExportResult.NoneTumorCDISC });
} }