Merge branch 'feat_8122' of http://git.woa.com/bkdevops/bk-ci into fe…

…at_8122

src/backend/ci/core/common/common-api/src/main/kotlin/com/tencent/devops/common/api/pojo/I18Variable.kt

@@ -42,4 +42,4 @@ data class I18Variable(
     val defaultMessage: String? = null
 ) {
     fun toJsonStr() = JsonUtil.toJson(this, false)
-}
+}

src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/trigger/PipelineTriggerEventVo.kt

@@ -61,6 +61,8 @@ data class PipelineTriggerEventVo(
     var buildNum: String? = null,
     @ApiModelProperty("原因")
     var reason: String? = null,
-    @ApiModelProperty("原因详情", required = false)
-    var reasonDetailList: List<String>? = null
+    @ApiModelProperty("失败原因详情", required = false)
+    var reasonDetailList: List<String>? = null,
+    @ApiModelProperty("失败原因", required = false)
+    var failReason: String = ""
 )

src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineRemoteAuthService.kt

@@ -129,7 +129,8 @@ class PipelineRemoteAuthService @Autowired constructor(
                  不使用client.get直接调用，因client内不支持同服务间的feign调用。故只能通过网关代理下 */
         val projectConsulTag = redisOperation.hget(ConsulConstants.PROJECT_TAG_REDIS_KEY, pipeline.projectId)
         return bkTag.invokeByTag(projectConsulTag) {
-            logger.info("start call service api ${pipeline.projectId} ${pipeline.pipelineId}, $projectConsulTag ${bkTag.getFinalTag()}")
+            logger.info("start call service api ${pipeline.projectId} ${pipeline.pipelineId}, " +
+                    "$projectConsulTag ${bkTag.getFinalTag()}")
             val buildId = pipelineTriggerEventService.saveSpecificEvent(
                 projectId = pipeline.projectId,
                 pipelineId = pipeline.pipelineId,

src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/trigger/PipelineTriggerEventService.kt

@@ -135,6 +135,7 @@ class PipelineTriggerEventService @Autowired constructor(
         val pageNotNull = page ?: 0
         val pageSizeNotNull = pageSize ?: PageUtil.MAX_PAGE_SIZE
         val sqlLimit = PageUtil.convertPageSizeToSQLMAXLimit(pageNotNull, pageSizeNotNull)
+        val language = I18nUtil.getLanguage(userId)
         val count = pipelineTriggerEventDao.countTriggerEvent(
             dslContext = dslContext,
             projectId = projectId,
@@ -157,12 +158,8 @@ class PipelineTriggerEventService @Autowired constructor(
             limit = sqlLimit.limit,
             offset = sqlLimit.offset
         ).map {
-            it.eventDesc = try {
-                JsonUtil.to(it.eventDesc, I18Variable::class.java).getCodeLanMessage(I18nUtil.getLanguage(userId))
-            } catch (ignored: Exception) {
-                logger.warn("Failed to resolve repo trigger event|sourceDesc[${it.eventDesc}]", ignored)
-                it.eventDesc
-            }
+            it.eventDesc = it.getI18nEventDesc(language)
+            it.reason = getI18nReason(it.reason,language)
             it
         }
         return SQLPage(count = count, records = records)
@@ -251,11 +248,7 @@ class PipelineTriggerEventService @Autowired constructor(
             limit = sqlLimit.limit,
             offset = sqlLimit.offset
         ).map {
-            it.eventDesc = it.getI18nEventDesc(language)
-            it.buildNum = it.getBuildNumUrl()
-            it.reasonDetailList = it.getI18nReasonDetailDesc(language)
-            it.reason = it.getI18nReason(language)
-            it
+            fillEventDetailParam(it, language)
         }
         val count = pipelineTriggerEventDao.countTriggerEvent(
             dslContext = dslContext,
@@ -472,14 +465,14 @@ class PipelineTriggerEventService @Autowired constructor(
         listOf()
     }
 
-    private fun PipelineTriggerEventVo.getI18nReason(language: String): String = getCodeLanMessage(
-        messageCode = if (this.reason.isNullOrBlank()) {
+    private fun getI18nReason(reason: String?, language: String): String = getCodeLanMessage(
+        messageCode = if (reason.isNullOrBlank()) {
             PipelineTriggerReason.TRIGGER_SUCCESS.name
         } else {
-            this.reason!!
+            reason
         },
         language = language,
-        defaultMessage = this.reason
+        defaultMessage = reason
     )
 
     /**
@@ -494,4 +487,26 @@ class PipelineTriggerEventService @Autowired constructor(
             null
         }
     }
+
+    /**
+     * 填充事件相关参数
+     * 事件描述国际化,构建链接,失败详情国际化,触发状态国际化,失败状态国际化
+     */
+    private fun fillEventDetailParam(
+        eventParam: PipelineTriggerEventVo,
+        language: String
+    ): PipelineTriggerEventVo {
+        return with(eventParam) {
+            eventDesc = getI18nEventDesc(language)
+            buildNum = getBuildNumUrl()
+            reasonDetailList = getI18nReasonDetailDesc(language)
+            reason = getI18nReason(eventParam.reason, language)
+            failReason = if (!reasonDetailList.isNullOrEmpty()) {
+                getI18nReason(PipelineTriggerReason.TRIGGER_NOT_MATCH.name, language)
+            } else {
+                ""
+            }
+            this
+        }
+    }
 }

src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/listener/WebhookEventListener.kt

@@ -52,6 +52,7 @@ class WebhookEventListener constructor(
     private val webhookRequestService: WebhookRequestService
 ) {
 
+    @SuppressWarnings("ComplexMethod", "LongMethod")
     fun handleCommitEvent(event: ICodeWebhookEvent) {
         val traceId = MDC.get(TraceTag.BIZID)
         if (traceId.isNullOrEmpty()) {