调整图片上传逻辑
This commit is contained in:
parent
9c1993f730
commit
44456861df
|
@ -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);
|
||||
}
|
||||
|
||||
// 文件保存路径的规则是 {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()
|
||||
|
|
|
@ -55,21 +55,29 @@ public class MinioHelper
|
|||
/// <param name="filePath"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<string> UploadFileAsync(string bucketName, string fileName, string filePath)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!await BucketExistsAsync(bucketName))
|
||||
{
|
||||
await _client.MakeBucketAsync(new MakeBucketArgs().WithBucket(bucketName));
|
||||
}
|
||||
|
||||
var response = await _client.PutObjectAsync(new PutObjectArgs()
|
||||
await _client.PutObjectAsync(new PutObjectArgs()
|
||||
.WithBucket(bucketName)
|
||||
.WithObject(fileName)
|
||||
.WithFileName(filePath));
|
||||
|
||||
Console.WriteLine(response);
|
||||
Console.WriteLine("文件上传成功");
|
||||
|
||||
return $"{bucketName}/{fileName}";
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine($"文件上传失败: {e}");
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 下载文件
|
||||
|
|
Loading…
Reference in New Issue