feat：新建/编辑流水线时支持调试流水线 TencentBlueKing#8164 增加配置管理

royalhuang · Oct 19, 2023 · ad82cf3 · ad82cf3
1 parent caab01b
commit ad82cf3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/...cess/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingVersionDao.kt b/...cess/biz-base/src/main/kotlin/com/tencent/devops/process/dao/PipelineSettingVersionDao.kt
@@ -212,7 +212,7 @@ class PipelineSettingVersionDao {
                     runLockType = PipelineRunLockType.valueOf(t.runLockType),
                     failSubscriptionList = failSubscriptionList,
                     labels = emptyList(),
-                    waitQueueTimeMinute = DateTimeUtil.secondToMinute(t.waitQueueTimeSecond ?: 600000),
+                    waitQueueTimeMinute = DateTimeUtil.secondToMinute(t.waitQueueTimeSecond?.toInt() ?: 600000),
                     maxQueueSize = t.maxQueueSize,
                     buildNumRule = t.buildNumRule,
                     concurrencyCancelInProgress = t.concurrencyCancelInProgress,

diff --git a/...c/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingFacadeService.kt b/...c/main/kotlin/com/tencent/devops/process/service/pipeline/PipelineSettingFacadeService.kt
@@ -31,8 +31,6 @@ import com.tencent.devops.common.api.constant.CommonMessageCode
 import com.tencent.devops.common.api.constant.KEY_DEFAULT
 import com.tencent.devops.common.api.exception.PermissionForbiddenException
 import com.tencent.devops.common.api.pojo.PipelineAsCodeSettings
-import com.tencent.devops.common.api.util.DateTimeUtil
-import com.tencent.devops.common.api.util.JsonUtil
 import com.tencent.devops.common.api.util.MessageUtil
 import com.tencent.devops.common.auth.api.AuthPermission
 import com.tencent.devops.common.auth.api.AuthResourceType