Compare commits

..

No commits in common. "cf245839748b274352d377f537a4aa41a2f55900" and "8dc2301184b7e0b33a7d7bbc1aabda2dcb88e1ec" have entirely different histories.

2 changed files with 5 additions and 5 deletions

View File

@ -324,7 +324,7 @@ namespace IRaCIS.Api.Controllers
public async Task<IResponseOutput> GetObjectStoreTokenAsync([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options, [FromServices] IOSSService _oSSService) public async Task<IResponseOutput> GetObjectStoreTokenAsync([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options, [FromServices] IOSSService _oSSService)
{ {
var result = _oSSService.GetObjectStoreTempToken(); var result = await _oSSService.GetObjectStoreTempToken();
result.AWS = await GetAWSTemToken(options.CurrentValue); result.AWS = await GetAWSTemToken(options.CurrentValue);

View File

@ -145,7 +145,7 @@ public interface IOSSService
public Task DeleteFromPrefix(string prefix); public Task DeleteFromPrefix(string prefix);
public ObjectStoreDTO GetObjectStoreTempToken(); public Task<ObjectStoreDTO> GetObjectStoreTempToken();
} }
@ -162,7 +162,7 @@ public class OSSService : IOSSService
{ {
ObjectStoreServiceOptions = options.CurrentValue; ObjectStoreServiceOptions = options.CurrentValue;
GetObjectStoreTempToken(); GetObjectStoreTempToken().GetAwaiter().GetResult();
} }
/// <summary> /// <summary>
@ -663,7 +663,7 @@ public class OSSService : IOSSService
public ObjectStoreDTO GetObjectStoreTempToken() public async Task<ObjectStoreDTO> GetObjectStoreTempToken()
{ {
var ossOptions = ObjectStoreServiceOptions.AliyunOSS; var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
@ -732,7 +732,7 @@ public class OSSService : IOSSService
DurationSeconds = awsOptions.DurationSeconds // 临时凭证有效期 DurationSeconds = awsOptions.DurationSeconds // 临时凭证有效期
}; };
var assumeRoleResponse = stsClient.AssumeRoleAsync(assumeRoleRequest).Result; var assumeRoleResponse = await stsClient.AssumeRoleAsync(assumeRoleRequest);
var credentials = assumeRoleResponse.Credentials; var credentials = assumeRoleResponse.Credentials;