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", realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/Check", $"{Guid.NewGuid()}_" + 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", realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/SiteSurvey", $"{Guid.NewGuid()}_"+ realFileName);
 
                 await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
 

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -44,6 +44,7 @@
       "secretKey": "l+yjtvV7Z4jiwm/7xCYv30UeUj/SvuqqYzAwjJHf",
       "bucketName": "ei-irc-test-store",
       "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
+
     }
   },
 

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -19,7 +19,7 @@ using SkiaSharp;
 
 namespace IRaCIS.Core.Application.Helper
 {
-    public class MinIOOptions : AWSOptions
+    public class MinIOOptions: AWSOptions
     {
         public int port { get; set; }
       
@@ -113,7 +113,7 @@ namespace IRaCIS.Core.Application.Helper
 
         public OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options)
         {
-            ObjectStoreServiceOptions = options.CurrentValue;
+             ObjectStoreServiceOptions = options.CurrentValue;
         }
 
         /// <summary>
@@ -125,10 +125,7 @@ namespace IRaCIS.Core.Application.Helper
         /// <returns></returns>
         public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName)
         {
-
-
-            var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}";
-            //var ossRelativePath = oosFolderPath + "/" + fileRealName;
+            var ossRelativePath = oosFolderPath + "/" + fileRealName;
 
             using (var memoryStream = new MemoryStream())
             {
@@ -207,9 +204,7 @@ namespace IRaCIS.Core.Application.Helper
         {
             var localFileName = Path.GetFileName(localFilePath);
 
-            var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}";
-
-            //var ossRelativePath = oosFolderPath + "/" + localFileName;
+            var ossRelativePath = oosFolderPath + "/" + localFileName;
 
 
             if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")

irc_api.drone.yml

@@ -93,8 +93,6 @@ server:
   user: root
   password:
     from_secret: test_ssh_pwd
-# ssh_key:
-#   from_secret: rsa_key
 
 steps:
 - name: publish-test-irc