Merge pull request TencentBlueKing#59 from yjieliang/feat-7556

Feat 7556
yjieliang · Sep 23, 2022 · cf3a225 · cf3a225
2 parents ab4e4b4 + ada207d
commit cf3a225
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/...ry-store/src/main/kotlin/com/tencent/devops/artifactory/api/ServiceArchiveAtomResource.kt b/...ry-store/src/main/kotlin/com/tencent/devops/artifactory/api/ServiceArchiveAtomResource.kt
@@ -34,7 +34,9 @@ import com.tencent.devops.store.pojo.common.enums.ReleaseTypeEnum
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import io.swagger.annotations.ApiParam
-import java.io.File
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition
+import org.glassfish.jersey.media.multipart.FormDataParam
+import java.io.InputStream
 import javax.ws.rs.Consumes
 import javax.ws.rs.DELETE
 import javax.ws.rs.GET
@@ -99,7 +101,10 @@ interface ServiceArchiveAtomResource {
         @QueryParam("releaseType")
         releaseType: ReleaseTypeEnum,
         @ApiParam("文件", required = true)
-        file: File,
+        @FormDataParam("file")
+        inputStream: InputStream,
+        @FormDataParam("file")
+        disposition: FormDataContentDisposition,
         @ApiParam("支持的操作系统", required = true)
         @QueryParam("os")
         os: String

diff --git a/...rc/main/kotlin/com/tencent/devops/artifactory/resources/ServiceArchiveAtomResourceImpl.kt b/...rc/main/kotlin/com/tencent/devops/artifactory/resources/ServiceArchiveAtomResourceImpl.kt
@@ -36,7 +36,6 @@ import com.tencent.devops.common.web.RestResource
 import com.tencent.devops.store.pojo.common.enums.ReleaseTypeEnum
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition
 import org.springframework.beans.factory.annotation.Autowired
-import java.io.File
 import java.io.InputStream
 
 @RestResource
@@ -60,13 +59,14 @@ class ServiceArchiveAtomResourceImpl @Autowired constructor(
         atomCode: String,
         version: String,
         releaseType: ReleaseTypeEnum,
-        file: File,
+        inputStream: InputStream,
+        disposition: FormDataContentDisposition,
         os: String
     ): Result<ArchiveAtomResponse?> {
         return archiveAtomService.archiveAtom(
             userId = userId,
-            inputStream = file.inputStream(),
-            disposition = FormDataContentDisposition("form-data; name=\"logo\"; filename=\"${file.name}\""),
+            inputStream = inputStream,
+            disposition = disposition,
             atomId = atomId,
             archiveAtomRequest = ArchiveAtomRequest(
                 projectCode = projectCode,

diff --git a/...mon/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/CommonUtils.kt b/...mon/common-service/src/main/kotlin/com/tencent/devops/common/service/utils/CommonUtils.kt
@@ -170,7 +170,7 @@ object CommonUtils {
         os: String
     ): Result<String?> {
         val serviceUrl = "$serviceUrlPrefix/service/artifactories/archiveAtom" +
-                "??userId=$userId&projectCode=$projectCode&atomId=$atomId&atomCode=$atomCode" +
+                "?userId=$userId&projectCode=$projectCode&atomId=$atomId&atomCode=$atomCode" +
                 "&version=$version&releaseType=$releaseType&os=$os"
 
         logger.info("the serviceUrl is:$serviceUrl")