Merge pull request #6273 from mingshewhe/bug_6270

bug: git事件触发插件配置过滤用户使用变量时不触发 #6270
TencentBlueKing · Mar 8, 2022 · 94ac06d · 94ac06d
2 parents beebb14 + 7d6cb45
commit 94ac06d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...bhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/UserFilter.kt b/...bhook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/UserFilter.kt
@@ -54,7 +54,7 @@ class UserFilter(
 
     private fun isUserNotExcluded(): Boolean {
         excludedUsers.forEach { excludeUser ->
-            if (triggerOnUser.matches(Regex(excludeUser))) {
+            if (excludeUser == triggerOnUser) {
                 logger.warn("$pipelineId|$excludeUser|the exclude user match the git event user")
                 return false
             }
@@ -64,7 +64,7 @@ class UserFilter(
 
     private fun isUserIncluded(): Boolean {
         includedUsers.forEach { includedUser ->
-            if (triggerOnUser.matches(Regex(includedUser))) {
+            if (includedUser == triggerOnUser) {
                 logger.warn("$pipelineId|includedUser|the included user match the git event user")
                 return true
             }

diff --git a/...in/kotlin/com/tencent/devops/process/plugin/trigger/configuration/TriggerConfiguration.kt b/...in/kotlin/com/tencent/devops/process/plugin/trigger/configuration/TriggerConfiguration.kt
@@ -132,10 +132,10 @@ class TriggerConfiguration {
             rabbitAdmin = rabbitAdmin,
             buildListener = buildListener,
             messageConverter = messageConverter,
-            startConsumerMinInterval = 20000,
+            startConsumerMinInterval = 5000,
             consecutiveActiveTrigger = 3,
             concurrency = timerConcurrency!!,
-            maxConcurrency = 20
+            maxConcurrency = 30
         )
     }