bug: 修复流水线事件重放报500错误 #11333

.github/workflows/release.yml

@@ -148,8 +148,8 @@ jobs:
         version=`echo $version | sed 's/-/./g'`
         major=`echo $version | cut -d. -f1`
         minor=`echo $version | cut -d. -f2`
-        echo "version_file=CHANGELOG/CHANGELOG-$major.$minor.md"
-        echo "version_file=CHANGELOG/CHANGELOG-$major.$minor.md" >> $GITHUB_OUTPUT
+        echo "version_file=CHANGELOG/zh_CN/CHANGELOG-$major.$minor.md"
+        echo "version_file=CHANGELOG/zh_CN/CHANGELOG-$major.$minor.md" >> $GITHUB_OUTPUT
     - name: Create Release
       id: create_release
       uses: ncipollo/[email protected]

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

@@ -481,7 +481,7 @@ data class StartBuildContext(
          */
         private fun fillCascadeParam(
             param: BuildParameters,
-            originStartContexts: HashMap<String, BuildParameters>,
+            originStartContexts: HashMap<String, BuildParameters>
         ): List<BuildParameters> {
             val originStartParams = mutableListOf<BuildParameters>()
             val key = param.key

src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/dao/PipelineTriggerEventDao.kt

@@ -461,7 +461,7 @@ class PipelineTriggerEventDao {
             dslContext.selectFrom(this)
                 .where(EVENT_ID.eq(eventId))
                 .and(PROJECT_ID.eq(projectId))
-                .fetchOne()
+                .fetchAny()
         }
         return record?.let { convertEvent(it) }
     }

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

@@ -259,10 +259,6 @@ class SubPipelineStartUpService @Autowired constructor(
             val model = resource.model
 
             val triggerContainer = model.getTriggerContainer()
-            templateFacadeService.printModifiedTemplateParams(
-                projectId = projectId, pipelineId = pipelineId,
-                pipelineParams = triggerContainer.params, paramValues = parameters
-            )
             // #6090 拨乱反正
             val params = buildParamCompatibilityTransformer.parseTriggerParam(
                 userId = userId, projectId = projectId, pipelineId = pipelineId,

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

@@ -672,10 +672,6 @@ class PipelineBuildFacadeService(
                 logger.info("[$pipelineId] buildNo was changed to [$buildNo]")
             }
 
-            templateFacadeService.printModifiedTemplateParams(
-                projectId = projectId, pipelineId = pipelineId,
-                pipelineParams = triggerContainer.params, paramValues = values
-            )
             val paramMap = buildParamCompatibilityTransformer.parseTriggerParam(
                 userId = userId, projectId = projectId, pipelineId = pipelineId,
                 paramProperties = triggerContainer.params, paramValues = values

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

@@ -2627,37 +2627,6 @@ class TemplateFacadeService @Autowired constructor(
         return pipelineTemplatePermissionService.enableTemplatePermissionManage(projectId)
     }
 
-    // TODO 埋点统计模板常量在流水线启动时被修改日志, 后续需要删除
-    fun printModifiedTemplateParams(
-        projectId: String,
-        pipelineId: String,
-        pipelineParams: List<BuildFormProperty>,
-        paramValues: Map<String, String>
-    ) {
-        val templatePipelineRecord = templatePipelineDao.get(dslContext, projectId, pipelineId) ?: return
-        val templateRecord =
-            templateDao.getTemplate(dslContext = dslContext, version = templatePipelineRecord.version) ?: return
-        val template: Model = objectMapper.readValue(templateRecord.template)
-        val templateParams = (template.getTriggerContainer()).templateParams
-        if (templateParams.isNullOrEmpty()) {
-            return
-        }
-        pipelineParams.forEach { param ->
-            val value = paramValues[param.id] ?: param.defaultValue
-            templateParams.forEach { template ->
-                if (template.id == param.id && template.defaultValue != value) {
-                    logger.warn(
-                        "BKSystemErrorMonitor|$projectId|$pipelineId|" +
-                                "templateId:${templateRecord.id}|templateVersion:${templateRecord.version}|" +
-                                "defaultValue:${template.defaultValue}|newValue:$value|" +
-                                "template params cannot be modified"
-                    )
-                    return
-                }
-            }
-        }
-    }
-
     companion object {
         private val logger = LoggerFactory.getLogger(TemplateFacadeService::class.java)
         private const val INIT_TEMPLATE_NAME = "init"

src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGitRepositoryService.kt

@@ -206,25 +206,19 @@ class CodeGitRepositoryService @Autowired constructor(
                 authType = repository.authType,
                 gitProjectId = gitProjectId
             )
-            val repositoryCodeRecord = repositoryCodeGitDao.get(
-                dslContext = transactionContext,
-                repositoryId = repositoryId
-            )
-            if (repositoryCodeRecord.authType == RepoAuthType.OAUTH.name &&
-                repositoryCodeRecord.userName != repository.userName) {
-                repositoryAuthorizationService.batchModifyHandoverFrom(
-                    projectId = projectId,
-                    resourceAuthorizationHandoverList = listOf(
-                        ResourceAuthorizationHandoverDTO(
-                            projectCode = projectId,
-                            resourceType = AuthResourceType.CODE_REPERTORY.value,
-                            resourceName = record.aliasName,
-                            resourceCode = repositoryHashId,
-                            handoverTo = repository.userName
-                        )
+            // 重置授权管理
+            repositoryAuthorizationService.batchModifyHandoverFrom(
+                projectId = projectId,
+                resourceAuthorizationHandoverList = listOf(
+                    ResourceAuthorizationHandoverDTO(
+                        projectCode = projectId,
+                        resourceType = AuthResourceType.CODE_REPERTORY.value,
+                        resourceName = record.aliasName,
+                        resourceCode = repositoryHashId,
+                        handoverTo = repository.userName
                     )
                 )
-            }
+            )
         }
     }
 

src/backend/ci/core/repository/biz-repository/src/main/kotlin/com/tencent/devops/repository/service/code/CodeGithubRepositoryService.kt

@@ -151,24 +151,18 @@ class CodeGithubRepositoryService @Autowired constructor(
                 repository.userName,
                 gitProjectId = gitProjectId
             )
-            val githubRepositoryRecord = repositoryGithubDao.get(
-                dslContext = transactionContext,
-                repositoryId = repositoryId
-            )
-            if (githubRepositoryRecord.userName != repository.userName) {
-                repositoryAuthorizationService.batchModifyHandoverFrom(
-                    projectId = projectId,
-                    resourceAuthorizationHandoverList = listOf(
-                        ResourceAuthorizationHandoverDTO(
-                            projectCode = projectId,
-                            resourceType = AuthResourceType.CODE_REPERTORY.value,
-                            resourceName = record.aliasName,
-                            resourceCode = repositoryHashId,
-                            handoverTo = repository.userName
-                        )
+            repositoryAuthorizationService.batchModifyHandoverFrom(
+                projectId = projectId,
+                resourceAuthorizationHandoverList = listOf(
+                    ResourceAuthorizationHandoverDTO(
+                        projectCode = projectId,
+                        resourceType = AuthResourceType.CODE_REPERTORY.value,
+                        resourceName = record.aliasName,
+                        resourceCode = repositoryHashId,
+                        handoverTo = repository.userName
                     )
                 )
-            }
+            )
         }
     }