diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 9f5f903e2..12f4630f5 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -566,7 +566,7 @@ namespace IRaCIS.Core.API.Controllers templateFileStream.Seek(0, SeekOrigin.Begin); - var ossRelativePath = await oSSService.UploadToOSSAsync(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 }); @@ -997,7 +997,7 @@ namespace IRaCIS.Core.API.Controllers throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_TemplateUploadData")); } - var ossRelativePath = await oSSService.UploadToOSSAsync(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 }); diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json index bc334cd7c..44df7a64a 100644 --- a/IRaCIS.Core.API/appsettings.Test_IRC.json +++ b/IRaCIS.Core.API/appsettings.Test_IRC.json @@ -44,7 +44,6 @@ "secretKey": "l+yjtvV7Z4jiwm/7xCYv30UeUj/SvuqqYzAwjJHf", "bucketName": "ei-irc-test-store", "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/" - } }, diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs index 92b57297d..4cacd52f1 100644 --- a/IRaCIS.Core.Application/Helper/OSSService.cs +++ b/IRaCIS.Core.Application/Helper/OSSService.cs @@ -19,10 +19,10 @@ using SkiaSharp; namespace IRaCIS.Core.Application.Helper { - public class MinIOOptions: AWSOptions + public class MinIOOptions : AWSOptions { public int port { get; set; } - + } public class AWSOptions @@ -113,7 +113,7 @@ namespace IRaCIS.Core.Application.Helper public OSSService(IOptionsMonitor options) { - ObjectStoreServiceOptions = options.CurrentValue; + ObjectStoreServiceOptions = options.CurrentValue; } /// @@ -125,7 +125,10 @@ namespace IRaCIS.Core.Application.Helper /// public async Task UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName) { - var ossRelativePath = oosFolderPath + "/" + fileRealName; + + + var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}"; + //var ossRelativePath = oosFolderPath + "/" + fileRealName; using (var memoryStream = new MemoryStream()) { @@ -204,7 +207,9 @@ namespace IRaCIS.Core.Application.Helper { var localFileName = Path.GetFileName(localFilePath); - var ossRelativePath = oosFolderPath + "/" + localFileName; + var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}"; + + //var ossRelativePath = oosFolderPath + "/" + localFileName; if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS") diff --git a/irc_api.drone.yml b/irc_api.drone.yml index 155e89067..6e76a7b0d 100644 --- a/irc_api.drone.yml +++ b/irc_api.drone.yml @@ -93,6 +93,8 @@ server: user: root password: from_secret: test_ssh_pwd +# ssh_key: +# from_secret: rsa_key steps: - name: publish-test-irc