From 04cd21fc61592b3c6b33ce903314cfcb7fd6c73d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yongyiduan=28=E6=AE=B5=E6=B0=B8=E5=84=84=29?= Date: Tue, 24 Sep 2024 17:34:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B0=E5=AF=8C=E6=B5=81=E6=B0=B4=E7=BA=BF-s?= =?UTF-8?q?tage=E5=87=86=E5=85=A5=E7=9A=84=E5=AE=A1=E6=A0=B8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=88=96=E7=94=A8=E6=88=B7=E7=BB=84=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=20#10689?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tencent/devops/process/constant/ProcessMessageCode.kt | 1 + .../devops/process/engine/service/PipelineStageService.kt | 7 ++++++- support-files/i18n/process/message_en_US.properties | 1 + support-files/i18n/process/message_zh_CN.properties | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt index 3dd67e2557a..591e64cdbc8 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt @@ -520,6 +520,7 @@ object ProcessMessageCode { const val BK_PREVIOUS_STAGE_SUCCESS = "bkPreviousStageSuccess" // [上游 Stage 成功时](Previous Stage Success): const val BK_UNEXECUTE_TASK = "bkUnexecuteTask" // 终止构建，跳过(UnExecute Task) const val BK_CONDITION_INVALID = "bkConditionInvalid" // 执行条件判断失败(Condition Invalid) + const val BK_STAGE_REVIEW_EMPTY_REVIEWER = "bkStageReviewEmptyViewer" // 由于无审核人，被系统自动驳回 // [SystemLog]收到终止指令(UnExecute PostAction Task) const val BK_UNEXECUTE_POSTACTION_TASK = "bkUnexecutePostactionTask" diff --git a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt index ddb0063e5fc..974020a8833 100644 --- a/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt +++ b/src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt @@ -40,7 +40,9 @@ import com.tencent.devops.common.pipeline.enums.BuildStatus import com.tencent.devops.common.pipeline.enums.ManualReviewAction import com.tencent.devops.common.pipeline.pojo.StagePauseCheck import com.tencent.devops.common.pipeline.pojo.StageReviewRequest +import com.tencent.devops.common.web.utils.I18nUtil import com.tencent.devops.common.websocket.enum.RefreshType +import com.tencent.devops.process.constant.ProcessMessageCode.BK_STAGE_REVIEW_EMPTY_REVIEWER import com.tencent.devops.process.engine.common.BS_MANUAL_START_STAGE import com.tencent.devops.process.engine.common.BS_QUALITY_ABORT_STAGE import com.tencent.devops.process.engine.common.BS_QUALITY_PASS_STAGE @@ -609,7 +611,10 @@ class PipelineStageService @Autowired constructor( reviewRequest = StageReviewRequest( reviewParams = listOf(), id = group.id, - suggest = "CANCEL with empty reviewer" + suggest = I18nUtil.getCodeLanMessage( + messageCode = BK_STAGE_REVIEW_EMPTY_REVIEWER, + language = I18nUtil.getDefaultLocaleLanguage() + ) ), debug = debug ) diff --git a/support-files/i18n/process/message_en_US.properties b/support-files/i18n/process/message_en_US.properties index 49f3c01cf90..7d9e4c06c0c 100644 --- a/support-files/i18n/process/message_en_US.properties +++ b/support-files/i18n/process/message_en_US.properties @@ -491,6 +491,7 @@ bkMergeYamlUpdateFileTitle=modify pipeline {0} bkBuildQueueWaitingForConcurrency=Concurrency Mode: {0}, concurrency for group[{1}] and queue size: {2}, now waiting for {3} bkBuildQueueWaiting=Concurrency Mode: {0}, queue size: {1} bkBuildCancelByConcurrency=Canceled by concurrency group[{0}] because of a higher priority waiting request {1} +bkStageReviewEmptyViewer=Because there is no reviewer, it was automatically rejected by the system operationLogType.NORMAL_SAVE_OPERATION=Normal save operation operationLogType.CREATE_PIPELINE_AND_DRAFT=Created draft diff --git a/support-files/i18n/process/message_zh_CN.properties b/support-files/i18n/process/message_zh_CN.properties index 2acaf0e63ac..e12a5babf49 100644 --- a/support-files/i18n/process/message_zh_CN.properties +++ b/support-files/i18n/process/message_zh_CN.properties @@ -491,6 +491,7 @@ bkMergeYamlUpdateFileTitle=[{0}]修改流水线[{1}] bkBuildQueueWaitingForConcurrency=构建的并发模式为：{0}，正在等待并发组[{1}]的[{2}]个构建执行完成，当前正在执行构建{3} bkBuildQueueWaiting=构建的并发模式为：{0}，正在等待[{1}]个构建执行完成 bkBuildCancelByConcurrency=构建将被并发组[{0}]中优先级更高的构建{1}取消 +bkStageReviewEmptyViewer=由于无审核人，被系统自动驳回 operationLogType.NORMAL_SAVE_OPERATION=普通保存操作 operationLogType.CREATE_PIPELINE_AND_DRAFT=创建了草稿