调整图片上传逻辑

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);
 
-            // 对图片进行压缩
+            if (isThumbnail)
-            GenerateThumbnail(dirInfo);
+            {
+                // 对图片进行压缩
+                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()

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>