Merge pull request #5238 from irwinsun/issue_5176

Issue 5176
TencentBlueKing · Sep 26, 2021 · 494f3f1 · 494f3f1
2 parents 2fc244d + 6cd08be
commit 494f3f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...ory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/ArchiveFileServiceImpl.kt b/...ory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/ArchiveFileServiceImpl.kt
@@ -111,11 +111,10 @@ abstract class ArchiveFileServiceImpl : ArchiveFileService {
         disposition: FormDataContentDisposition,
         fileChannelType: FileChannelTypeEnum
     ): String {
-        val path = generateDestPath(fileType, projectId, customFilePath, pipelineId, buildId)
-        val destPath = if (!path.endsWith(disposition.fileName)) {
-            path + fileSeparator + disposition.fileName
+        val destPath = if (customFilePath?.endsWith(disposition.fileName) != true) {
+            (customFilePath ?: "") + fileSeparator + disposition.fileName
         } else {
-            path
+            customFilePath
         }
         val servicePipelineResource = client.get(ServicePipelineResource::class)
         val pipelineName = servicePipelineResource.getPipelineNameByIds(

diff --git a/...src/main/kotlin/com/tencent/devops/artifactory/service/impl/DiskArchiveFileServiceImpl.kt b/...src/main/kotlin/com/tencent/devops/artifactory/service/impl/DiskArchiveFileServiceImpl.kt
@@ -353,6 +353,7 @@ class DiskArchiveFileServiceImpl : ArchiveFileServiceImpl() {
         props: Map<String, String?>?,
         fileChannelType: FileChannelTypeEnum
     ): String {
+        logger.info("uploadFile|filePath=$filePath|fileName=$fileName|props=$props")
         val uploadFileName = fileName ?: file.name
         val fileTypeStr = fileType?.fileType ?: "file"
         val destPath = if (null == filePath) {
@@ -364,14 +365,14 @@ class DiskArchiveFileServiceImpl : ArchiveFileServiceImpl() {
                     fileType = fileType,
                     projectId = projectId,
                     customFilePath = filePath,
-                    pipelineId = null,
-                    buildId = null
+                    pipelineId = props?.get("pipelineId"),
+                    buildId = props?.get("buildId")
                 )
             } else {
                 "${getBasePath()}$fileSeparator$filePath"
             }
         }
-        logger.info("$uploadFileName destPath is:$destPath")
+        logger.info("uploadFile|$uploadFileName destPath is:$destPath")
         uploadFileToRepo(destPath, file)
         val shaContent = file.inputStream().use { ShaUtils.sha1InputStream(it) }
         var fileProps: Map<String, String?> = props ?: mapOf()