Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHANGELOG: Update directory for v3.1.0 release #11390

Closed
wants to merge 17 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
31b36bb
Merge pull request #11292 from TencentBlueKing/changelog/v3.0.11
mingshewhe Dec 5, 2024
d32edee
bug:多环境情况下流水线编辑页面插件logo缓存优化 #11380
carlyin0801 Jan 7, 2025
b7b7746
bug:多环境情况下流水线编辑页面插件logo缓存优化 #11380
carlyin0801 Jan 7, 2025
7982b51
feat:新增service接口用于获取流水线组下流水线 #11383
fcfang123 Jan 7, 2025
84e6cf8
bug:修改分级管理员授权范围偶现不成功现象 #11334
fcfang123 Jan 7, 2025
c218415
bug: 新增错误类型枚举导致前端解析异常 #11386
Jan 8, 2025
dde7b5d
CHANGELOG: Update directory for v3.1.0 release
bkci-bot Jan 8, 2025
1d6be2c
CHANGELOG: Update directory for v3.1.0 release
mingshewhe Jan 8, 2025
5000298
Merge pull request #11389 from TencentBlueKing/changelog/v3.1.0
mingshewhe Jan 8, 2025
d81d83c
bug: 修复v3.0版本打helm chart包时报错 #11391
mingshewhe Jan 8, 2025
692cd7a
bug: 修复v3.0版本打helm chart包时报错 #11391
mingshewhe Jan 8, 2025
6060bbd
Merge pull request #11388 from royalhuang/issue_11386
mingshewhe Jan 8, 2025
d3a9e31
Merge pull request #11384 from fcfang123/issue-11383
mingshewhe Jan 8, 2025
71a1e56
Merge pull request #11381 from carlyin0801/issue_11380_env_atom_logo_fix
mingshewhe Jan 8, 2025
f9bbe43
Merge pull request #11392 from mingshewhe/bug_11391
mingshewhe Jan 8, 2025
3de2f05
CHANGELOG: Update directory for v3.0.12 release
bkci-bot Jan 8, 2025
38177f9
Merge pull request #11393 from TencentBlueKing/changelog/v3.0.12
mingshewhe Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
358 changes: 358 additions & 0 deletions CHANGELOG/en/CHANGELOG-3.1.md

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions CHANGELOG/zh_CN/CHANGELOG-3.0.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<!-- BEGIN MUNGE: GENERATED_TOC -->
- [v3.0.12](#v3012)
- [Changelog since v3.0.11](#changelog-since-v3011)

- [v3.0.11](#v3011)
- [Changelog since v3.0.0](#changelog-since-v300)
- [v3.0.1-v3.0.11]
- 因镜像版本与仓库版本没有统一,v3.0.1-v3.0.11已有镜像版本,但没有仓库版本,所以仓库这些版本直接跳过
- [v3.0.1-v3.0.10]
- 因镜像版本与仓库版本没有统一,v3.0.1-v3.0.10已有镜像版本,但没有仓库版本,所以仓库这些版本直接跳过
- [v3.0.0](#v300)
- [Changelog since v2.1.0](#changelog-since-v210)
- [v3.0.0-rc.1](#v300-rc1)
Expand All @@ -13,6 +16,14 @@


<!-- NEW RELEASE NOTES ENTRY -->
# v3.0.12
## 2025-01-08
### Changelog since v3.0.11
#### 修复

##### 未分类
- [修复] bug: 修复v3.0版本打helm chart包时报错 [链接](http://github.com/TencentBlueKing/bk-ci/issues/11391)

# v3.0.11
## 2024-12-05
### Changelog since v3.0.0
Expand Down
227 changes: 227 additions & 0 deletions CHANGELOG/zh_CN/CHANGELOG-3.1.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ enum class ErrorType(
val typeName: String,
val num: Int
) {
// 非常注意:此关联前端展示的图标,前端枚举需要同步更新
SYSTEM("system", 0), // 0 系统运行报错
USER("user", 1), // 1 用户配置报错
THIRD_PARTY("thirdParty", 2), // 2 第三方系统接入错误
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,14 @@ interface ServicePipelineViewResource {
@PathParam("pipelineId")
pipelineId: String
): Result<Set<Long>>

@Operation(summary = "根据视图ID获取流水线ID列表")
@POST
@Path("/pipelines/listPipelineIdByViewIds")
fun listPipelineIdByViewIds(
@PathParam("projectId")
projectId: String,
@Parameter(description = "按视图过滤", required = false)
viewIdsEncode: List<String>
): Result<List<String>>
}
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,13 @@ class ServicePipelineViewResourceImpl @Autowired constructor(
pipelineViewGroupService.listViewIdsByPipelineId(projectId, pipelineId)
)
}

override fun listPipelineIdByViewIds(
projectId: String,
viewIdsEncode: List<String>
): Result<List<String>> {
return Result(
pipelineViewGroupService.listPipelineIdsByViewIds(projectId, viewIdsEncode)
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ import com.tencent.devops.common.auth.api.pojo.ProjectConditionDTO
import com.tencent.devops.common.auth.api.pojo.ResourceRegisterInfo
import com.tencent.devops.common.auth.api.pojo.SubjectScopeInfo
import com.tencent.devops.common.auth.code.ProjectAuthServiceCode
import com.tencent.devops.common.auth.enums.SubjectScopeType
import com.tencent.devops.common.client.Client
import com.tencent.devops.common.client.ClientTokenService
import com.tencent.devops.common.event.dispatcher.SampleEventDispatcher
Expand Down Expand Up @@ -766,9 +767,27 @@ abstract class AbsProjectServiceImpl @Autowired constructor(
beforeSubjectScopes: List<SubjectScopeInfo>,
afterSubjectScopes: List<SubjectScopeInfo>
): Boolean {
val beforeIds = beforeSubjectScopes.map { it.id }.toSet()
val afterIds = afterSubjectScopes.map { it.id }.toSet()
return beforeIds != afterIds
val beforeUsernames = beforeSubjectScopes
.filter { it.type == SubjectScopeType.USER.value }
.map { it.username }
.toSet()

val afterUsernames = afterSubjectScopes
.filter { it.type == SubjectScopeType.USER.value }
.map { it.username }
.toSet()

val beforeDeptIds = beforeSubjectScopes
.filter { it.type != SubjectScopeType.USER.value }
.map { it.id }
.toSet()

val afterDeptIds = afterSubjectScopes
.filter { it.type != SubjectScopeType.USER.value }
.map { it.id }
.toSet()

return beforeUsernames != afterUsernames || beforeDeptIds != afterDeptIds
}

private fun updateApprovalInfo(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,22 @@ package com.tencent.devops.store.atom.service.impl

import com.fasterxml.jackson.core.type.TypeReference
import com.github.benmanes.caffeine.cache.Caffeine
import com.tencent.devops.common.api.auth.REFERER
import com.tencent.devops.common.api.constant.CommonMessageCode
import com.tencent.devops.common.api.exception.ErrorCodeException
import com.tencent.devops.common.api.util.JsonUtil
import com.tencent.devops.common.api.util.ThreadLocalUtil
import com.tencent.devops.common.util.RegexUtils
import com.tencent.devops.common.web.utils.BkApiUtil
import com.tencent.devops.common.web.utils.I18nUtil
import com.tencent.devops.model.store.tables.TAtom
import com.tencent.devops.store.atom.dao.AtomDao
import com.tencent.devops.store.atom.dao.AtomPropDao
import com.tencent.devops.store.pojo.atom.AtomProp
import com.tencent.devops.store.atom.service.AtomPropService
import com.tencent.devops.store.common.service.StoreI18nMessageService
import com.tencent.devops.store.common.service.action.StoreDecorateFactory
import com.tencent.devops.store.common.utils.StoreUtils
import com.tencent.devops.store.pojo.atom.AtomProp
import com.tencent.devops.store.pojo.atom.enums.AtomStatusEnum
import com.tencent.devops.store.pojo.common.ATOM_OUTPUT
import com.tencent.devops.store.pojo.common.enums.StoreTypeEnum
Expand Down Expand Up @@ -81,8 +84,10 @@ class AtomPropServiceImpl @Autowired constructor(
var atomPropMap: MutableMap<String, AtomProp>? = null
// 从缓存中查找插件属性信息
var queryDbAtomCodes: MutableList<String>? = null
val referer = BkApiUtil.getHttpServletRequest()?.getHeader(REFERER) ?: ThreadLocalUtil.get(REFERER)?.toString()
val refererHost = referer?.let { RegexUtils.splitDomainContextPath("$referer/")?.first } ?: ""
atomCodes.forEach { atomCode ->
val atomProp = atomPropCache.getIfPresent(atomCode)
val atomProp = atomPropCache.getIfPresent("$refererHost:$atomCode")
if (atomProp != null) {
if (atomPropMap == null) {
atomPropMap = mutableMapOf()
Expand Down Expand Up @@ -124,7 +129,7 @@ class AtomPropServiceImpl @Autowired constructor(
)
atomPropMap!![atomCode] = atomProp
// 把数据放入缓存
atomPropCache.put(atomCode, atomProp)
atomPropCache.put("$refererHost:$atomCode", atomProp)
}
}
return atomPropMap
Expand Down