Merge branch 'Test.Study' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.Study

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -146,7 +146,7 @@ namespace IRaCIS.Api.Controllers
 
                 var ossOptions = serviceOption.AliyunOSS;
 
-                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO ,AliyunOSS= serviceOption.AliyunOSS });
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AliyunOSS = serviceOption.AliyunOSS, AWS = serviceOption.AWS });
 
                 #region 临时token 屏蔽
                 //IClientProfile profile = DefaultProfile.GetProfile(ossOptions.RegionId, ossOptions.AccessKeyId, ossOptions.AccessKeySecret);
@@ -189,11 +189,11 @@ namespace IRaCIS.Api.Controllers
             }
             else if (Enum.TryParse<ObjectStoreUse>(serviceOption.ObjectStoreUse, out var parsedValue) && parsedValue == ObjectStoreUse.MinIO)
             {
-                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO });
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AWS = serviceOption.AWS });
             }
             else
             {
-                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO });
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AWS = serviceOption.AWS });
             }
 
         }

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -800,7 +800,7 @@ namespace IRaCIS.Core.API.Controllers
                 templateFileStream.Seek(0, SeekOrigin.Begin);
 
 
-                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/Check", $"{Guid.NewGuid()}_" + realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/Check",  realFileName);
 
                 await _repository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
 
@@ -1024,7 +1024,7 @@ namespace IRaCIS.Core.API.Controllers
                     throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_TemplateUploadData"));
                 }
 
-                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/SiteSurvey", $"{Guid.NewGuid()}_"+ realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/SiteSurvey",  realFileName);
 
                 await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
 

IRaCIS.Core.API/appsettings.Test_Study.json

@@ -20,12 +20,22 @@
     },
 
     "MinIO": {
-      "endpoint": "http://192.168.3.68",
+      "endPoint": "192.168.3.68",
       "port": "8001",
       "useSSL": false,
       "accessKey": "IDFkwEpWej0b4DtiuThL",
       "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test"
+      "bucketName": "test",
+      "viewEndpoint": "http://192.168.3.68:8001/test/"
+    },
+
+    "AWS": {
+      "endPoint": "s3.us-east-1.amazonaws.com",
+      "useSSL": false,
+      "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
+      "secretKey": "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",
+      "bucketName": "ei-irc-test-store",
+      "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
     }
   },
 

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -3,6 +3,8 @@ using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using Minio.DataModel.Args;
+using Minio;
 using NPOI.HPSF;
 using SharpCompress.Common;
 using System;
@@ -13,17 +15,24 @@ using System.Linq;
 using System.Security.AccessControl;
 using System.Text;
 using System.Threading.Tasks;
+using SkiaSharp;
 
 namespace IRaCIS.Core.Application.Helper
 {
-    public class MinIOOptions
+    public class MinIOOptions : AWSOptions
     {
-        public string endpoint { get; set; }
-        public string port { get; set; }
+        public int port { get; set; }
+
+    }
+
+    public class AWSOptions
+    {
+        public string endPoint { get; set; }
         public bool useSSL { get; set; }
         public string accessKey { get; set; }
         public string secretKey { get; set; }
         public string bucketName { get; set; }
+        public string viewEndpoint { get; set; }
     }
 
     public class AliyunOSSOptions
@@ -48,6 +57,8 @@ namespace IRaCIS.Core.Application.Helper
         public AliyunOSSOptions AliyunOSS { get; set; }
         public MinIOOptions MinIO { get; set; }
 
+        public AWSOptions AWS { get; set; }
+
     }
 
     public class ObjectStoreDTO
@@ -58,6 +69,8 @@ namespace IRaCIS.Core.Application.Helper
 
         public MinIOOptions MinIO { get; set; }
 
+        public AWSOptions AWS { get; set; }
+
     }
 
     public class AliyunOSSTempToken
@@ -81,37 +94,26 @@ namespace IRaCIS.Core.Application.Helper
         AWS = 2,
     }
 
-
-
-
-
-
     public interface IOSSService
     {
-        public string UploadToOSS(Stream fileStream, string oosFolderPath, string fileRealName);
-        public string UploadToOSS(string localFilePath, string oosFolderPath);
+        public Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName);
+        public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath);
 
-        public void DownLoadFromOSS(string ossRelativePath, string localFilePath);
+        public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath);
 
+        public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
 
     }
+
+
     public class OSSService : IOSSService
     {
-
-        public AliyunOSSOptions _OSSConfig { get; set; }
-
-        public OssClient _ossClient { get; set; }
-
+        public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
 
 
         public OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options)
         {
-            var ossOptions = options.CurrentValue;
-
-            _OSSConfig = ossOptions.AliyunOSS;
-
-            _ossClient = new OssClient(_OSSConfig.endPoint, _OSSConfig.accessKeyId, _OSSConfig.accessKeySecret);
-
+            ObjectStoreServiceOptions = options.CurrentValue;
         }
 
         /// <summary>
@@ -121,14 +123,13 @@ namespace IRaCIS.Core.Application.Helper
         /// <param name="oosFolderPath"></param>
         /// <param name="fileRealName"></param>
         /// <returns></returns>
-        /// <exception cref="BusinessValidationFailedException"></exception>
-        public string UploadToOSS(Stream fileStream, string oosFolderPath,string fileRealName)
+        public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName)
         {
 
-            var ossRelativePath = oosFolderPath + "/" + fileRealName;
 
-            try
-            {
+            var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}";
+            //var ossRelativePath = oosFolderPath + "/" + fileRealName;
+
             using (var memoryStream = new MemoryStream())
             {
                 fileStream.Seek(0, SeekOrigin.Begin);
@@ -137,19 +138,63 @@ namespace IRaCIS.Core.Application.Helper
 
                 memoryStream.Seek(0, SeekOrigin.Begin);
 
+
+                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                {
+                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+
+
                     // 上传文件
-                    var result = _ossClient.PutObject(_OSSConfig.bucketName, ossRelativePath, memoryStream);
+                    var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, memoryStream);
+
+                }
+                else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+                {
+                    var minIOConfig = ObjectStoreServiceOptions.MinIO;
+
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    var putObjectArgs = new PutObjectArgs()
+                           .WithBucket(minIOConfig.bucketName)
+                           .WithObject(ossRelativePath)
+                           .WithStreamData(memoryStream);
+
+                    await minioClient.PutObjectAsync(putObjectArgs);
+                }
+                else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+                {
+                    var minIOConfig = ObjectStoreServiceOptions.AWS;
+
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    var putObjectArgs = new PutObjectArgs()
+                           .WithBucket(minIOConfig.bucketName)
+                           .WithObject(ossRelativePath)
+                           .WithStreamData(memoryStream);
+
+                    await minioClient.PutObjectAsync(putObjectArgs);
+                }
+                else
+                {
+                    throw new BusinessValidationFailedException("未定义的存储介质类型");
+                }
             }
 
 
             return "/" + ossRelativePath;
-            }
-            catch (Exception ex)
-            {
-                throw new BusinessValidationFailedException("oss上传失败" + ex.Message);
 
         }
-        }
+
+
 
         /// <summary>
         /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
@@ -158,32 +203,81 @@ namespace IRaCIS.Core.Application.Helper
         /// <param name="oosFolderPath"></param>
         /// <returns></returns>
         /// <exception cref="BusinessValidationFailedException"></exception>
-        public string UploadToOSS(string localFilePath, string oosFolderPath)
+        public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath)
         {
             var localFileName = Path.GetFileName(localFilePath);
 
-            var ossRelativePath = oosFolderPath + "/" + localFileName;
+            var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}";
+
+            //var ossRelativePath = oosFolderPath + "/" + localFileName;
 
 
-            try
+            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
             {
+                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
                 // 上传文件
-                var result = _ossClient.PutObject(_OSSConfig.bucketName, ossRelativePath, localFilePath);
+                var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, localFilePath);
 
-                return ossRelativePath;
             }
-            catch (Exception ex)
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
             {
-                throw new BusinessValidationFailedException("oss上传失败" + ex.Message);
+                var minIOConfig = ObjectStoreServiceOptions.MinIO;
 
-            }
-        }
 
-        public void DownLoadFromOSS(string ossRelativePath, string localFilePath)
+                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
+                    .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                    .Build();
+
+                var putObjectArgs = new PutObjectArgs()
+                       .WithBucket(minIOConfig.bucketName)
+                       .WithObject(ossRelativePath)
+                       .WithFileName(localFilePath);
+
+                await minioClient.PutObjectAsync(putObjectArgs);
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
             {
+                var minIOConfig = ObjectStoreServiceOptions.AWS;
+
+
+                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                    .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                    .Build();
+
+                var putObjectArgs = new PutObjectArgs()
+                       .WithBucket(minIOConfig.bucketName)
+                       .WithObject(ossRelativePath)
+                       .WithFileName(localFilePath);
+
+                await minioClient.PutObjectAsync(putObjectArgs);
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+            return "/" + ossRelativePath;
+
+        }
+
+        public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
+        {
+
+            ossRelativePath = ossRelativePath.TrimStart('/');
             try
             {
-                var result = _ossClient.GetObject(_OSSConfig.bucketName, ossRelativePath);
+
+
+                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                {
+                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+                    // 上传文件
+                    var result = _ossClient.GetObject(aliConfig.bucketName, ossRelativePath);
 
                     // 将下载的文件流保存到本地文件
                     using (var fs = File.OpenWrite(localFilePath))
@@ -191,6 +285,43 @@ namespace IRaCIS.Core.Application.Helper
                         result.Content.CopyTo(fs);
                         fs.Close();
                     }
+
+                }
+                else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+                {
+                    var minIOConfig = ObjectStoreServiceOptions.MinIO;
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    var getObjectArgs = new GetObjectArgs()
+                    .WithBucket(minIOConfig.bucketName)
+                    .WithObject(ossRelativePath)
+                    .WithFile(localFilePath);
+
+                    await minioClient.GetObjectAsync(getObjectArgs);
+
+                }
+                else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+                {
+                    var minIOConfig = ObjectStoreServiceOptions.AWS;
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    var getObjectArgs = new GetObjectArgs()
+                    .WithBucket(minIOConfig.bucketName)
+                    .WithObject(ossRelativePath)
+                    .WithFile(localFilePath);
+
+                    await minioClient.GetObjectAsync(getObjectArgs);
+                }
+                else
+                {
+                    throw new BusinessValidationFailedException("未定义的存储介质类型");
+                }
             }
             catch (Exception ex)
             {
@@ -199,6 +330,9 @@ namespace IRaCIS.Core.Application.Helper
             }
 
 
+
+
+
         }
 
 

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -89,6 +89,7 @@
 		<PackageReference Include="MediatR" Version="12.1.1" />
 		<PackageReference Include="MimeKit" Version="4.2.0" />
 		<PackageReference Include="MiniExcel" Version="1.31.2" />
+		<PackageReference Include="Minio" Version="6.0.1" />
 		<PackageReference Include="MiniWord" Version="0.7.0" />
 		<PackageReference Include="My.Extensions.Localization.Json" Version="3.0.0">
 			<TreatAsUsed>true</TreatAsUsed>

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -94,7 +94,7 @@
             <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSS(System.IO.Stream,System.String,System.String)">
+        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSSAsync(System.IO.Stream,System.String,System.String)">
             <summary>
              oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
             </summary>
@@ -102,9 +102,8 @@
             <param name="oosFolderPath"></param>
             <param name="fileRealName"></param>
             <returns></returns>
-            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
-        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSS(System.String,System.String)">
+        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSSAsync(System.String,System.String)">
             <summary>
             oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
             </summary>