feat: 接口返回的完整平台访问url整改，只返回content-path,不返回域名 #4796

修正不指定文件名时为空的问题
TencentBlueKing · Sep 25, 2021 · 6cd08be · 6cd08be
1 parent 461d372
commit 6cd08be
Showing 1 changed file with 3 additions and 3 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,10 +111,10 @@ abstract class ArchiveFileServiceImpl : ArchiveFileService {
         disposition: FormDataContentDisposition,
         fileChannelType: FileChannelTypeEnum
     ): String {
-        val destPath = if (customFilePath?.endsWith(disposition.fileName) == false) {
-            customFilePath + fileSeparator + disposition.fileName
+        val destPath = if (customFilePath?.endsWith(disposition.fileName) != true) {
+            (customFilePath ?: "") + fileSeparator + disposition.fileName
         } else {
-            customFilePath ?: ""
+            customFilePath
         }
         val servicePipelineResource = client.get(ServicePipelineResource::class)
         val pipelineName = servicePipelineResource.getPipelineNameByIds(