bug: 修复创建TGIT 创建MR失败 #40

hejieehe · hejieehe · commit 9a95625d1615 · 2025-08-20T09:36:38.000+08:00
diff --git a/devops-scm-provider/devops-scm-provider-git/devops-scm-provider-tgit/src/main/kotlin/com/tencent/devops/scm/provider/git/tgit/TGitObjectToMapConverter.kt b/devops-scm-provider/devops-scm-provider-git/devops-scm-provider-tgit/src/main/kotlin/com/tencent/devops/scm/provider/git/tgit/TGitObjectToMapConverter.kt
@@ -270,9 +270,11 @@ object TGitObjectToMapConverter {
             params[BK_REPO_GIT_MANUAL_UNLOCK] = false
             params[PIPELINE_GIT_BEFORE_SHA] = "----------"
             params[PIPELINE_GIT_BEFORE_SHA_SHORT] = "----------"
-            params[PIPELINE_GIT_MR_ACTION] = action
             params[BK_REPO_GIT_WEBHOOK_NOTE_CREATED_AT] = simpleDateFormat.format(createdAt)
             params[BK_REPO_GIT_WEBHOOK_NOTE_UPDATED_AT] = simpleDateFormat.format(updatedAt)
+            src.mergeRequest?.let {
+                params[PIPELINE_GIT_MR_ACTION] = it.action ?: ""
+            }
             return params
         }
     }
diff --git a/devops-scm-provider/devops-scm-provider-git/devops-scm-provider-tgit/src/main/kotlin/com/tencent/devops/scm/provider/git/tgit/TGitWebhookParser.kt b/devops-scm-provider/devops-scm-provider-git/devops-scm-provider-tgit/src/main/kotlin/com/tencent/devops/scm/provider/git/tgit/TGitWebhookParser.kt
@@ -476,7 +476,7 @@ class TGitWebhookParser : WebhookParser {
             }
             params[PIPELINE_GIT_BEFORE_SHA] = src.before
             params[PIPELINE_GIT_BEFORE_SHA_SHORT] = GitUtils.getShortSha(src.before)
-            params[PIPELINE_GIT_TAG_MESSAGE] = src.message
+            params[PIPELINE_GIT_TAG_MESSAGE] = src.message ?: ""
             src.commits.firstOrNull()?.let { lastCommit ->
                 params[PIPELINE_GIT_COMMIT_AUTHOR] = lastCommit.author.name
                 params[PIPELINE_GIT_COMMIT_MESSAGE] = lastCommit.message

Original file line number	Diff line number	Diff line change
`@@ -270,9 +270,11 @@ object TGitObjectToMapConverter {`
`270`	`270`	`params[BK_REPO_GIT_MANUAL_UNLOCK] = false`
`271`	`271`	`params[PIPELINE_GIT_BEFORE_SHA] = "----------"`
`272`	`272`	`params[PIPELINE_GIT_BEFORE_SHA_SHORT] = "----------"`
`273`		`- params[PIPELINE_GIT_MR_ACTION] = action`
`274`	`273`	`params[BK_REPO_GIT_WEBHOOK_NOTE_CREATED_AT] = simpleDateFormat.format(createdAt)`
`275`	`274`	`params[BK_REPO_GIT_WEBHOOK_NOTE_UPDATED_AT] = simpleDateFormat.format(updatedAt)`
	`275`	`+ src.mergeRequest?.let {`
	`276`	`+ params[PIPELINE_GIT_MR_ACTION] = it.action ?: ""`
	`277`	`+ }`
`276`	`278`	`return params`
`277`	`279`	`}`
`278`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ class TGitWebhookParser : WebhookParser {`
`476`	`476`	`}`
`477`	`477`	`params[PIPELINE_GIT_BEFORE_SHA] = src.before`
`478`	`478`	`params[PIPELINE_GIT_BEFORE_SHA_SHORT] = GitUtils.getShortSha(src.before)`
`479`		`- params[PIPELINE_GIT_TAG_MESSAGE] = src.message`
	`479`	`+ params[PIPELINE_GIT_TAG_MESSAGE] = src.message ?: ""`
`480`	`480`	`src.commits.firstOrNull()?.let { lastCommit ->`
`481`	`481`	`params[PIPELINE_GIT_COMMIT_AUTHOR] = lastCommit.author.name`
`482`	`482`	`params[PIPELINE_GIT_COMMIT_MESSAGE] = lastCommit.message`