Feat 12010 #12403

yjieliang · 2025-11-06T12:48:51Z

No description provided.

carlyin0801 · 2026-01-26T04:14:58Z

...e-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/PreScriptBuildYamlParser.kt

+    }
+
+    @JsonSetter("variables")
+    private fun setVariables(raw: Any?) {


setVariables 是私有的，但接口定义了公共的 variables setter。当通过接口调用 variables = ... 时，setVariables 方法不会被调用，导致解析逻辑失效。

carlyin0801 · 2026-01-26T04:16:45Z

...e-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/PreScriptBuildYamlParser.kt

+            }
+            is Map<*, *> -> {
+                // 提取template数据
+                val templateList = raw["template"] as? List<Map<String, String>>


"template"这种类型的key为什么要一直重复写死成字符串，常量类里面有公用的吧

carlyin0801 · 2026-01-26T06:48:18Z

...ine-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/parsers/template/YamlTemplate.kt

+                if (templateList.isNotEmpty()) {
+                    preYamlObject.variableTemplates = templateList.mapNotNull { template ->
+                        val name = template["name"]
+                        if (name == null) {


代码使用lamba表达式优化下，另外"version"之类的名称别写死了，用常量类

carlyin0801 · 2026-01-26T07:16:30Z

...common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ModelVarRefUtils.kt

+                val trimmedLine = line.trimStart()
+                // 保留非注释行：不以#开头，且不以REM开头（不区分大小写）
+                !trimmedLine.startsWith("#") && 
+                !trimmedLine.startsWith("REM ", ignoreCase = true) &&


REM 注释判断逻辑不完整，REM 注释的规则是：只要行开头（忽略前置空白）以 REM 开头（无论后面是否有空格 / 字符），都属于注释行。

carlyin0801 · 2026-01-26T07:17:26Z

...common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ModelVarRefUtils.kt

+                !trimmedLine.startsWith("REM ", ignoreCase = true) &&
+                !trimmedLine.equals("REM", ignoreCase = true)
+            }
+            .joinToString("\n")


换行符处理不一致，text文本可能在windows或者linux机器上执行

carlyin0801 · 2026-01-26T07:48:36Z

...d/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/Model.kt

+                    versionName = versionName
+                )
+            }
+            .distinctBy { it.groupName } // 根据 groupName 去重


去重的逻辑是不是应该根据 groupName 和 version 去重

carlyin0801 · 2026-01-26T08:47:07Z

...rocess/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt

+    const val ERROR_TRIGGER_EVENT_EXPIRED = "2101341"
+    const val ERROR_PIPELINE_COMMON_VAR_GROUP_VAR_NAME_FORMAT_ERROR = "2101342" // 流水线公共变量组中变量名称格式错误
+    // 编排配置公共变量组中存在冲突变量{0}，请调整变量组配置
+    const val ERROR_PIPELINE_COMMON_VAR_GROUP_CONFLICT = "2101343"


2101342和2101343错误码有冲突

carlyin0801 · 2026-01-26T09:07:10Z

...-base/src/main/kotlin/com/tencent/devops/process/dao/template/PipelineTemplateResourceDao.kt

+            val where = dslContext.select(MODEL)
+                .from(this)
+                .where(TEMPLATE_ID.eq(templateId).and(PROJECT_ID.eq(projectId)))
+            if (version != null) {


IDE提示重复的代码，提取出来

carlyin0801 · 2026-01-26T09:37:18Z

...process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/var/PublicVarReferInfoDao.kt

+        referType: PublicVerGroupReferenceTypeEnum,
+        referVersion: Int,
+        groupName: String,
+        version: Int


方法参数太多了，封装成bean处理下

carlyin0801 · 2026-01-26T09:38:32Z

...process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/var/PublicVarReferInfoDao.kt

+     * @param version 版本号（可选）
+     * @return 变量引用信息列表
+     */
+    fun listVarReferInfoByReferIdAndVersion(


参数太多，一般超过5个建议封装成bean处理

…ommon_var' into feat-12010 # Conflicts: # src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ModelTransfer.kt # src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/StageTransfer.kt # src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/VariableTransfer.kt # src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v2/utils/YamlCommonUtils.kt # src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/PreScriptBuildYamlParser.kt # src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/models/PreScriptBuildYamlV3Parser.kt # src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/parsers/template/YamlTemplate.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/Model.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/ModelDeserializer.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/ModelDeserializerModifier.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/ModelHandleService.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/container/TriggerContainer.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/BuildFormProperty.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/PublicVarGroupRef.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/pojo/VarRefDetail.kt # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/ModelVarRefUtils.kt # src/backend/ci/core/metrics/api-metrics/src/main/kotlin/com/tencent/devops/metrics/api/ServiceMetricsResource.kt # src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/dao/PipelineOverviewDao.kt # src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/resources/ServiceMetricsResourceImpl.kt # src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/PipelineOverviewManageService.kt # src/backend/ci/core/metrics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/service/impl/PipelineOverviewServiceImpl.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServicePublicVarGroupResource.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/user/UserPublicVarGroupResource.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/user/UserPublicVarResource.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/do/PublicGroupVarRefDO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/do/PublicVarDO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/do/PublicVarGroupDO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/do/PublicVarReleaseDO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/dto/PublicVarGroupDTO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/dto/PublicVarGroupInfoQueryReqDTO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/dto/PublicVarGroupReferDTO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/enums/OperateTypeEnum.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/enums/PublicVarTypeEnum.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/po/PublicVarGroupPO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/po/PublicVarPO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/var/po/PublicVarPositionPO.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVersionUtils.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/var/PublicVarDao.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/var/PublicVarGroupDao.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/var/PublicVarGroupReferInfoDao.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/var/PublicVarGroupReleaseRecordDao.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/dao/var/PublicVarReferInfoDao.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/template/TemplatePipelineDao.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryService.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/PipelineUtils.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/ModelHandleServiceImpl.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/var/PublicVarGroupReleaseRecordService.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/var/PublicVarGroupService.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/var/PublicVarReferInfoService.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/var/PublicVarService.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserPublicVarGroupResourceImpl.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/UserPublicVarResourceImpl.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/service/ServicePublicVarGroupResourceImpl.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineInfoFacadeService.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/PipelineVersionFacadeService.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/TemplateFacadeService.kt # support-files/i18n/process/message_en_US.properties # support-files/i18n/process/message_zh_CN.properties

Feat 12010

…ommon_var' into feat-12010 # Conflicts: # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/var/PublicVarGroupReferManageService.kt

…2010 # Conflicts: # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/TemplateInstanceUtil.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/version/handler/PipelineDraftReleaseHandler.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/pipeline/version/handler/PipelineTemplateInstanceHandler.kt

…2010 # Conflicts: # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/version/hander/PipelineTemplateDraftReleaseHandler.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/template/v2/version/hander/PipelineTemplateDraftSaveHandler.kt

yjieliang added 30 commits August 25, 2025 10:06

feat:流水线公共变量管理 TencentBlueKing#12010

ce9e94d

feat:流水线公共变量管理 TencentBlueKing#12010

518d2b2

feat:流水线公共变量管理 TencentBlueKing#12010

1292574

feat:流水线公共变量管理 TencentBlueKing#12010

d5fddc6

feat:流水线公共变量管理 TencentBlueKing#12010

1f371f5

feat:流水线公共变量管理 TencentBlueKing#12010

06b5238

feat:流水线公共变量管理 TencentBlueKing#12010

e793971

feat:流水线公共变量管理 TencentBlueKing#12010

ee2c096

feat:流水线公共变量管理 TencentBlueKing#12010

c1c4f20

feat:流水线公共变量管理 TencentBlueKing#12010

cdef257

feat:流水线公共变量管理 TencentBlueKing#12010

f330e17

feat:流水线公共变量管理 TencentBlueKing#12010

154b4d6

feat:流水线公共变量管理 TencentBlueKing#12010

78c446d

feat:流水线公共变量管理 TencentBlueKing#12010

f68dbf0

feat:流水线公共变量管理 TencentBlueKing#12010

5879813

feat:流水线公共变量管理 TencentBlueKing#12010

63abb9b

feat:流水线公共变量管理 TencentBlueKing#12010

da9c51c

feat:流水线公共变量管理 TencentBlueKing#12010

280b7f6

feat:流水线公共变量管理 TencentBlueKing#12010

ae4d94c

feat:流水线公共变量管理 TencentBlueKing#12010

cc98a64

feat:流水线公共变量管理 TencentBlueKing#12010

ea2ee32

feat:流水线公共变量管理 TencentBlueKing#12010

d07aa4a

feat:流水线公共变量管理 TencentBlueKing#12010

1c62e2a

feat:流水线公共变量管理 TencentBlueKing#12010

aa7a62d

Merge branch 'refs/heads/master' into feat_12010

5c508a1

feat:流水线公共变量管理 TencentBlueKing#12010

af45ad1

feat:流水线公共变量管理 TencentBlueKing#12010

7822dc2

feat:流水线公共变量管理 TencentBlueKing#12010

0dbb46e

feat:流水线公共变量管理 TencentBlueKing#12010

161d315

feat:流水线公共变量管理 TencentBlueKing#12010

73875e2

yjieliang added 2 commits January 26, 2026 11:58

feat:流水线公共变量管理 TencentBlueKing#12010

14b8b95

feat:流水线公共变量管理 TencentBlueKing#12010

cbfee60

carlyin0801 reviewed Jan 26, 2026

View reviewed changes

yjieliang and others added 26 commits January 26, 2026 18:14

feat:流水线公共变量管理 TencentBlueKing#12010

0adbb56

Merge pull request TencentBlueKing#116 from yjieliang/feat-12010

9ceda42

Feat 12010

feat:流水线公共变量管理 TencentBlueKing#12010

bc499b1

feat:流水线公共变量管理 TencentBlueKing#12010

66a7844

feat:流水线公共变量管理 TencentBlueKing#12010

d5ffb83

feat:流水线公共变量管理 TencentBlueKing#12010

fd7ce13

feat:流水线公共变量管理 TencentBlueKing#12010

989d496

feat:流水线公共变量管理 TencentBlueKing#12010

99aed6e

Merge remote-tracking branch 'refs/remotes/carlyin-bkci/issue_12010_c…

06f894d

…ommon_var' into feat-12010 # Conflicts: # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/service/var/PublicVarGroupReferManageService.kt

feat:流水线公共变量管理 TencentBlueKing#12010

d177067

feat:流水线公共变量管理 TencentBlueKing#12010

efdd31d

feat:流水线公共变量管理 TencentBlueKing#12010

9be2c5a

feat:流水线公共变量管理 TencentBlueKing#12010

8817236

feat:流水线公共变量管理 TencentBlueKing#12010

d78905e

feat:流水线公共变量管理 TencentBlueKing#12010

4290f45

feat:流水线公共变量管理 TencentBlueKing#12010

639f765

feat:流水线公共变量管理 TencentBlueKing#12010

04f3c1a

feat:流水线公共变量管理 TencentBlueKing#12010

2cde367

feat:流水线公共变量管理 TencentBlueKing#12010

78b8c4a

feat:流水线公共变量管理 TencentBlueKing#12010

a8c66b5

feat:流水线公共变量管理 TencentBlueKing#12010

3f32d55

feat:流水线公共变量管理 TencentBlueKing#12010

6c87b04

feat:流水线公共变量管理 TencentBlueKing#12010

e36a6e5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat 12010 #12403

Feat 12010 #12403

Uh oh!

yjieliang commented Nov 6, 2025

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

carlyin0801 Jan 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Feat 12010 #12403

Are you sure you want to change the base?

Feat 12010 #12403

Uh oh!

Conversation

yjieliang commented Nov 6, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants