From bbdaebc7f51291bbfff222e731da08f3856d64bc Mon Sep 17 00:00:00 2001
From: royalhuang <royalhuang@tencent.com>
Date: Wed, 23 Oct 2024 15:33:25 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=8E=A8=E8=8D=90=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E4=BC=98=E5=8C=96=20#10958=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0app=E7=AB=AF=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tencent/devops/process/api/ServiceBuildResourceImpl.kt | 7 +++++++
 .../devops/process/api/app/AppPipelineBuildResourceImpl.kt | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServiceBuildResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServiceBuildResourceImpl.kt
index 06ccb7a04a6..b4d0cf8ddc3 100644
--- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServiceBuildResourceImpl.kt
+++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/ServiceBuildResourceImpl.kt
@@ -64,6 +64,7 @@ import com.tencent.devops.process.pojo.pipeline.PipelineLatestBuild
 import com.tencent.devops.process.service.builds.PipelineBuildFacadeService
 import com.tencent.devops.process.service.builds.PipelineBuildMaintainFacadeService
 import com.tencent.devops.process.service.builds.PipelinePauseBuildFacadeService
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 
 @Suppress("ALL")
@@ -76,6 +77,9 @@ class ServiceBuildResourceImpl @Autowired constructor(
     private val pipelineRuntimeService: PipelineRuntimeService,
     private val containerBuildRecordService: ContainerBuildRecordService
 ) : ServiceBuildResource {
+
+    private val logger = LoggerFactory.getLogger(ServiceBuildResourceImpl::class.java)
+
     override fun getPipelineIdFromBuildId(projectId: String, buildId: String): Result<String> {
         if (buildId.isBlank()) {
             throw ParamBlankException("Invalid buildId, it must not empty.")
@@ -764,6 +768,9 @@ class ServiceBuildResourceImpl @Autowired constructor(
     ): Result<BuildId> {
         checkUserId(userId)
         checkParam(projectId, pipelineId)
+        if (buildNo != null) {
+            logger.info("API|manualStartupNew|$userId|$projectId|$pipelineId|buildNo=$buildNo")
+        }
         return Result(
             pipelineBuildFacadeService.buildManualStartup(
                 userId = userId,
diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResourceImpl.kt
index 304b945363c..d847ed3ac02 100644
--- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResourceImpl.kt
+++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/app/AppPipelineBuildResourceImpl.kt
@@ -280,7 +280,10 @@ class AppPipelineBuildResourceImpl @Autowired constructor(
                 pipelineId = pipelineId,
                 version = version,
                 channelCode = channelCode
-            )
+            ).apply {
+                // TODO app暂时无法同步特性，临时方案为buildNo覆盖为currentBuildNo
+                buildNo?.currentBuildNo?.let { buildNo?.buildNo = it }
+            }
         )
     }