From 3813158b00b42743a02bb9db2ea7dedb5d88a8df Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Sat, 14 Sep 2024 17:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9oss=20=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRC.Core.SCP/Service/OSSService.cs | 20 ++++++++++++-------- IRaCIS.Core.API/appsettings.Test_IRC.json | 2 +- IRaCIS.Core.Application/Helper/OSSService.cs | 20 ++++++++++++-------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/IRC.Core.SCP/Service/OSSService.cs b/IRC.Core.SCP/Service/OSSService.cs index 897a62386..4af37a247 100644 --- a/IRC.Core.SCP/Service/OSSService.cs +++ b/IRC.Core.SCP/Service/OSSService.cs @@ -323,12 +323,13 @@ namespace IRaCIS.Core.SCP var awsConfig = ObjectStoreServiceOptions.AWS; // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -398,12 +399,13 @@ namespace IRaCIS.Core.SCP var awsConfig = ObjectStoreServiceOptions.AWS; // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -491,12 +493,13 @@ namespace IRaCIS.Core.SCP // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -620,12 +623,13 @@ namespace IRaCIS.Core.SCP // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json index 1ccc9c7f2..b42343431 100644 --- a/IRaCIS.Core.API/appsettings.Test_IRC.json +++ b/IRaCIS.Core.API/appsettings.Test_IRC.json @@ -44,7 +44,7 @@ "AccessKeyId": "AKIAW3MEAFJX7IPXISP4", "SecretAccessKey": "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", "BucketName": "ei-med-s3-lili-uat-store", - "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com", + "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/", "DurationSeconds": 7200 } }, diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs index f4609a16e..76ed3c248 100644 --- a/IRaCIS.Core.Application/Helper/OSSService.cs +++ b/IRaCIS.Core.Application/Helper/OSSService.cs @@ -325,12 +325,13 @@ namespace IRaCIS.Core.Application.Helper var awsConfig = ObjectStoreServiceOptions.AWS; // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -400,12 +401,13 @@ namespace IRaCIS.Core.Application.Helper var awsConfig = ObjectStoreServiceOptions.AWS; // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -493,12 +495,13 @@ namespace IRaCIS.Core.Application.Helper // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig); @@ -622,12 +625,13 @@ namespace IRaCIS.Core.Application.Helper // 提供awsAccessKeyId和awsSecretAccessKey构造凭证 - var credentials = new BasicAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey); + var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken); //提供awsEndPoint（域名）进行访问配置 var clientConfig = new AmazonS3Config { - ServiceURL = awsConfig.EndPoint + RegionEndpoint = RegionEndpoint.USEast1, + UseHttp = true, }; var amazonS3Client = new AmazonS3Client(credentials, clientConfig);