Skip to content

Commit

Permalink
Merge pull request #10773 from yaoxuwan/issue_10667
Browse files Browse the repository at this point in the history
bug: 归档构件的制品页,显示有误,路径不完整,缺少文件大小 #10667
  • Loading branch information
bkci-bot authored Aug 6, 2024
2 parents 82c80ac + 59fc593 commit def9d8d
Showing 1 changed file with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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}}")
Expand Down Expand Up @@ -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<QueryNodeInfo>): Map<String, String> {
Expand All @@ -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(
Expand Down

0 comments on commit def9d8d

Please sign in to comment.