From 44456861dff13ce7007bfe0f61f4fc3dfa4430e2 Mon Sep 17 00:00:00 2001
From: huangxianguo <huangxianguo@haijumasstransfer.com>
Date: Thu, 18 Jul 2024 10:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImageExporter/ImageService.cs             | 13 +++++---
 .../Minio/MinioHelper.cs                      | 30 ++++++++++++-------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/MasstransferExporter/ImageExporter/ImageService.cs b/MasstransferExporter/ImageExporter/ImageService.cs
index d2bae04..8ab1a19 100644
--- a/MasstransferExporter/ImageExporter/ImageService.cs
+++ b/MasstransferExporter/ImageExporter/ImageService.cs
@@ -87,7 +87,7 @@ public class ImageService
     {
         var yesterday = DateTime.Today.AddDays(-2);
 
-        await ImageExporter(yesterday);
+        await ImageExporter(yesterday, false);
     }
 
     /// <summary>
@@ -99,6 +99,8 @@ public class ImageService
     {
         try
         {
+            var bucket = isThumbnail ? "thumbnail" : "image";
+
             var systemParams = GetSystemParams();
             var imageStoragePath =
                 systemParams!.ImageStoragePath ?? Environment.GetEnvironmentVariable("USERPROFILE");
@@ -111,8 +113,11 @@ public class ImageService
 
             var dirInfo = new DirectoryInfo(dir);
 
-            // 对图片进行压缩
-            GenerateThumbnail(dirInfo);
+            if (isThumbnail)
+            {
+                // 对图片进行压缩
+                GenerateThumbnail(dirInfo);
+            }
 
             // 文件保存路径的规则是  {user BasePath}/masstransfer/images/{yyyyMMdd}/{batchCode}/wafer/{waferCode}/{timestamp}.bmp
             var files = dirInfo.GetDirectories();
@@ -136,7 +141,7 @@ public class ImageService
 
                             var path = image.FullName;
 
-                            await Minio.UploadFileAsync("image", fileName, path);
+                            await Minio.UploadFileAsync(bucket, fileName, path);
                         }
 
                         var data = new ImageExportData()
diff --git a/MasstransferInfrastructure/Minio/MinioHelper.cs b/MasstransferInfrastructure/Minio/MinioHelper.cs
index 92e76fa..27bcec0 100644
--- a/MasstransferInfrastructure/Minio/MinioHelper.cs
+++ b/MasstransferInfrastructure/Minio/MinioHelper.cs
@@ -56,19 +56,27 @@ public class MinioHelper
     /// <returns></returns>
     public async Task<string> UploadFileAsync(string bucketName, string fileName, string filePath)
     {
-        if (!await BucketExistsAsync(bucketName))
+        try
         {
-            await _client.MakeBucketAsync(new MakeBucketArgs().WithBucket(bucketName));
+            if (!await BucketExistsAsync(bucketName))
+            {
+                await _client.MakeBucketAsync(new MakeBucketArgs().WithBucket(bucketName));
+            }
+
+            await _client.PutObjectAsync(new PutObjectArgs()
+                .WithBucket(bucketName)
+                .WithObject(fileName)
+                .WithFileName(filePath));
+
+            Console.WriteLine("文件上传成功");
+
+            return $"{bucketName}/{fileName}";
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine($"文件上传失败: {e}");
+            return "";
         }
-
-        var response = await _client.PutObjectAsync(new PutObjectArgs()
-            .WithBucket(bucketName)
-            .WithObject(fileName)
-            .WithFileName(filePath));
-
-        Console.WriteLine(response);
-
-        return $"{bucketName}/{fileName}";
     }
 
     /// <summary>