feat：定时触发器支持设置启动变量 TencentBlueKing#10617

hejieehe · Jan 6, 2025 · 0888691 · 0888691
1 parent 305d787
commit 0888691
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...n/kotlin/com/tencent/devops/process/plugin/trigger/service/PipelineTimerUpgradeService.kt b/...n/kotlin/com/tencent/devops/process/plugin/trigger/service/PipelineTimerUpgradeService.kt
@@ -48,7 +48,7 @@ open class PipelineTimerUpgradeService @Autowired constructor(
 ) {
     @SuppressWarnings("NestedBlockDepth")
     fun upgrade(userId: String, targetProjectId: String?, targetPipelineId: String?) {
-        logger.info("upgrade pipeline timer||targetProjectId=$targetProjectId|targetPipelineId=$targetPipelineId")
+        logger.info("upgrade pipeline timer|targetProjectId=$targetProjectId|targetPipelineId=$targetPipelineId")
         var offset = 0
         val limit = 100
         do {
@@ -191,7 +191,6 @@ open class PipelineTimerUpgradeService @Autowired constructor(
     fun getTimerTriggerConfig(model: Model) = model.getTriggerContainer()
         .elements.filter { it is TimerTriggerElement && it.elementEnabled() }.map { it as TimerTriggerElement }
 
-
     companion object {
         private val logger = LoggerFactory.getLogger(PipelineTimerUpgradeService::class.java)
     }

diff --git a/...in/kotlin/com/tencent/devops/process/plugin/trigger/timer/quartz/PipelineQuartzService.kt b/...in/kotlin/com/tencent/devops/process/plugin/trigger/timer/quartz/PipelineQuartzService.kt
@@ -110,7 +110,7 @@ class PipelineQuartzService @Autowired constructor(
         try {
             val md5 = DigestUtils.md5Hex(crontab)
             val comboKey = if (taskId.isEmpty()) {
-                "${pipelineId}_${md5}_${projectId}"
+                "${pipelineId}_${md5}_$projectId"
             } else {
                 "${pipelineId}_${md5}_${projectId}_$taskId"
             }