From 59fc59304f42278daf4795e32418b2e0514471d2 Mon Sep 17 00:00:00 2001 From: yaoxuwan Date: Tue, 6 Aug 2024 16:58:21 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E5=BD=92=E6=A1=A3=E6=9E=84=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=88=B6=E5=93=81=E9=A1=B5,=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9C=89=E8=AF=AF,=E8=B7=AF=E5=BE=84=E4=B8=8D=E5=AE=8C?= =?UTF-8?q?=E6=95=B4,=E7=BC=BA=E5=B0=91=E6=96=87=E4=BB=B6=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=20#10667?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BkRepoArchiveFileServiceImpl.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/backend/ci/core/artifactory/biz-artifactory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/BkRepoArchiveFileServiceImpl.kt b/src/backend/ci/core/artifactory/biz-artifactory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/BkRepoArchiveFileServiceImpl.kt index e88d84043c7..2af038e2ff8 100644 --- a/src/backend/ci/core/artifactory/biz-artifactory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/BkRepoArchiveFileServiceImpl.kt +++ b/src/backend/ci/core/artifactory/biz-artifactory/src/main/kotlin/com/tencent/devops/artifactory/service/impl/BkRepoArchiveFileServiceImpl.kt @@ -88,8 +88,7 @@ import javax.ws.rs.NotFoundException @ConditionalOnProperty(prefix = "artifactory", name = ["realm"], havingValue = "bkrepo") class BkRepoArchiveFileServiceImpl @Autowired constructor( private val bkRepoClientConfig: BkRepoClientConfig, - private val bkRepoClient: BkRepoClient, - private val servicePipelineResource: ServicePipelineResource + private val bkRepoClient: BkRepoClient ) : ArchiveFileServiceImpl() { @Value("\${bkrepo.dockerRegistry:#{null}}") @@ -356,7 +355,8 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( if (pipelineIds.size == 0) { return emptyMap() } - return servicePipelineResource.getPipelineNameByIds(nodeList.first().projectId, pipelineIds).data.orEmpty() + return client.get(ServicePipelineResource::class) + .getPipelineNameByIds(nodeList.first().projectId, pipelineIds).data.orEmpty() } private fun getBuildNums(nodeList: List): Map { @@ -372,7 +372,8 @@ class BkRepoArchiveFileServiceImpl @Autowired constructor( if (buildIds.size == 0) { return emptyMap() } - return servicePipelineResource.getBuildNoByBuildIds(buildIds, nodeList.first().projectId).data.orEmpty() + return client.get(ServicePipelineResource::class) + .getBuildNoByBuildIds(buildIds, nodeList.first().projectId).data.orEmpty() } private fun getFullName(