From f5fbf967724a715dde85c4b181dd7f70adaab0da Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 27 Sep 2024 17:11:53 +0800 Subject: [PATCH] =?UTF-8?q?oss=20=E8=8E=B7=E5=8F=96token=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=90=8C=E6=AD=A5=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Controllers/ExtraController.cs | 2 +- IRaCIS.Core.Application/Helper/OSSService.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs index a9ec63b2d..fc66826c6 100644 --- a/IRaCIS.Core.API/Controllers/ExtraController.cs +++ b/IRaCIS.Core.API/Controllers/ExtraController.cs @@ -324,7 +324,7 @@ namespace IRaCIS.Api.Controllers public async Task GetObjectStoreTokenAsync([FromServices] IOptionsMonitor options, [FromServices] IOSSService _oSSService) { - var result = await _oSSService.GetObjectStoreTempToken(); + var result = _oSSService.GetObjectStoreTempToken(); result.AWS = await GetAWSTemToken(options.CurrentValue); diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs index eb441c9e3..77a0d7f00 100644 --- a/IRaCIS.Core.Application/Helper/OSSService.cs +++ b/IRaCIS.Core.Application/Helper/OSSService.cs @@ -145,7 +145,7 @@ public interface IOSSService public Task DeleteFromPrefix(string prefix); - public Task GetObjectStoreTempToken(); + public ObjectStoreDTO GetObjectStoreTempToken(); } @@ -162,7 +162,7 @@ public class OSSService : IOSSService { ObjectStoreServiceOptions = options.CurrentValue; - GetObjectStoreTempToken().GetAwaiter().GetResult(); + GetObjectStoreTempToken(); } /// @@ -663,7 +663,7 @@ public class OSSService : IOSSService - public async Task GetObjectStoreTempToken() + public ObjectStoreDTO GetObjectStoreTempToken() { var ossOptions = ObjectStoreServiceOptions.AliyunOSS; @@ -732,7 +732,7 @@ public class OSSService : IOSSService DurationSeconds = awsOptions.DurationSeconds // 临时凭证有效期 }; - var assumeRoleResponse = await stsClient.AssumeRoleAsync(assumeRoleRequest); + var assumeRoleResponse = stsClient.AssumeRoleAsync(assumeRoleRequest).Result; var credentials = assumeRoleResponse.Credentials;