IRC.Core.SCP/Service/OSSService.cs

@@ -1,34 +1,47 @@
-using AlibabaCloud.SDK.Sts20150401;
-using Aliyun.OSS;
-using Amazon;
+using Aliyun.OSS;
+using IRaCIS.Core.Infrastructure;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using Minio.DataModel.Args;
+using Minio;
+using SharpCompress.Common;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Security.AccessControl;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+using System.Text.Json.Serialization;
+using Minio.ApiEndpoints;
+using System.Reactive.Linq;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.NewtonsoftJson;
 using Amazon.Runtime;
-using Amazon.S3;
-using Amazon.S3.Model;
 using Amazon.SecurityToken;
 using Amazon.SecurityToken.Model;
-using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Infrastructure.NewtonsoftJson;
+using Amazon;
+using Amazon.S3;
+using Amazon.S3.Model;
 using MassTransit;
-using Microsoft.Extensions.Options;
-using Minio;
-using Minio.DataModel.Args;
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
+using AlibabaCloud.SDK.Sts20150401;
 
-namespace IRaCIS.Core.SCP;
-
-#region 绑定和返回模型
-
-[LowerCamelCaseJson]
-public class MinIOOptions : AWSOptions
+namespace IRaCIS.Core.SCP
 {
+    #region 绑定和返回模型
+
+    [LowerCamelCaseJson]
+    public class MinIOOptions : AWSOptions
+    {
         public int Port { get; set; }
 
-}
+    }
 
 
-public class AWSOptions
-{
+    public class AWSOptions
+    {
         public string EndPoint { get; set; }
         public bool UseSSL { get; set; }
         public string AccessKeyId { get; set; }
@@ -38,10 +51,10 @@ public class AWSOptions
         public string ViewEndpoint { get; set; }
         public int DurationSeconds { get; set; }
         public string Region { get; set; }
-}
+    }
 
-public class AliyunOSSOptions
-{
+    public class AliyunOSSOptions
+    {
         public string RegionId { get; set; }
         public string AccessKeyId { get; set; }
         public string AccessKeySecret { get; set; }
@@ -61,10 +74,10 @@ public class AliyunOSSOptions
 
 
 
-}
+    }
 
-public class ObjectStoreServiceOptions
-{
+    public class ObjectStoreServiceOptions
+    {
         public string ObjectStoreUse { get; set; }
 
         public AliyunOSSOptions AliyunOSS { get; set; }
@@ -74,10 +87,10 @@ public class ObjectStoreServiceOptions
 
         public AWSOptions AWS { get; set; }
 
-}
+    }
 
-public class ObjectStoreDTO
-{
+    public class ObjectStoreDTO
+    {
         public string ObjectStoreUse { get; set; }
 
 
@@ -87,11 +100,11 @@ public class ObjectStoreDTO
 
         public AWSTempToken AWS { get; set; }
 
-}
+    }
 
-[LowerCamelCaseJson]
-public class AliyunOSSTempToken
-{
+    [LowerCamelCaseJson]
+    public class AliyunOSSTempToken
+    {
         public string AccessKeyId { get; set; }
         public string AccessKeySecret { get; set; }
 
@@ -106,11 +119,11 @@ public class AliyunOSSTempToken
         public DateTime Expiration { get; set; }
 
 
-}
+    }
 
-[LowerCamelCaseJson]
-public class AWSTempToken
-{
+    [LowerCamelCaseJson]
+    public class AWSTempToken
+    {
         public string Region { get; set; }
         public string SessionToken { get; set; }
         public string EndPoint { get; set; }
@@ -119,21 +132,21 @@ public class AWSTempToken
         public string BucketName { get; set; }
         public string ViewEndpoint { get; set; }
         public DateTime Expiration { get; set; }
-}
+    }
 
-public enum ObjectStoreUse
-{
+    public enum ObjectStoreUse
+    {
         AliyunOSS = 0,
         MinIO = 1,
         AWS = 2,
-}
+    }
 
-#endregion
+    #endregion
 
-// aws 参考链接 https://github.com/awsdocs/aws-doc-sdk-examples/tree/main/dotnetv3/S3/S3_Basics
+    // aws 参考链接 https://github.com/awsdocs/aws-doc-sdk-examples/tree/main/dotnetv3/S3/S3_Basics
 
-public interface IOSSService
-{
+    public interface IOSSService
+    {
         public Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true);
         public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true);
 
@@ -145,12 +158,12 @@ public interface IOSSService
 
         public Task DeleteFromPrefix(string prefix);
 
-    public ObjectStoreDTO GetObjectStoreTempToken();
-}
+        public Task<ObjectStoreDTO> GetObjectStoreTempToken();
+    }
 
 
-public class OSSService : IOSSService
-{
+    public class OSSService : IOSSService
+    {
         public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
 
         private AliyunOSSTempToken AliyunOSSTempToken { get; set; }
@@ -162,10 +175,9 @@ public class OSSService : IOSSService
         {
             ObjectStoreServiceOptions = options.CurrentValue;
 
+            GetObjectStoreTempToken().GetAwaiter().GetResult();
         }
 
-
-
         /// <summary>
         ///  oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
         /// </summary>
@@ -176,8 +188,6 @@ public class OSSService : IOSSService
         /// <returns></returns>
         public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true)
         {
-        GetObjectStoreTempToken();
-
             var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}" : $"{oosFolderPath}/{fileRealName}";
 
             try
@@ -277,8 +287,6 @@ public class OSSService : IOSSService
         /// <exception cref="BusinessValidationFailedException"></exception>
         public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true)
         {
-        GetObjectStoreTempToken();
-
             var localFileName = Path.GetFileName(localFilePath);
 
             var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}" : $"{oosFolderPath}/{localFileName}";
@@ -347,7 +355,6 @@ public class OSSService : IOSSService
 
         public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
         {
-        GetObjectStoreTempToken();
 
             ossRelativePath = ossRelativePath.TrimStart('/');
             try
@@ -433,8 +440,6 @@ public class OSSService : IOSSService
 
         public async Task<string> GetSignedUrl(string ossRelativePath)
         {
-        GetObjectStoreTempToken();
-
             ossRelativePath = ossRelativePath.TrimStart('/');
             try
             {
@@ -533,8 +538,6 @@ public class OSSService : IOSSService
         /// <returns></returns>
         public async Task DeleteFromPrefix(string prefix)
         {
-        GetObjectStoreTempToken();
-
             if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
             {
                 var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
@@ -671,9 +674,10 @@ public class OSSService : IOSSService
         }
 
 
-    public ObjectStoreDTO GetObjectStoreTempToken()
-    {
 
+
+        public async Task<ObjectStoreDTO> GetObjectStoreTempToken()
+        {
             var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
 
             if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
@@ -741,7 +745,7 @@ public class OSSService : IOSSService
                     DurationSeconds = awsOptions.DurationSeconds          // 临时凭证有效期
                 };
 
-            var assumeRoleResponse = stsClient.AssumeRoleAsync(assumeRoleRequest).Result;
+                var assumeRoleResponse = await stsClient.AssumeRoleAsync(assumeRoleRequest);
 
                 var credentials = assumeRoleResponse.Credentials;
 
@@ -767,4 +771,7 @@ public class OSSService : IOSSService
             }
         }
 
+    }
+
+
 }