diff --git a/helm-charts/core/ci/templates/gateway/deployment.yaml b/helm-charts/core/ci/templates/gateway/deployment.yaml index f1617fa095b..b5329e0cf51 100644 --- a/helm-charts/core/ci/templates/gateway/deployment.yaml +++ b/helm-charts/core/ci/templates/gateway/deployment.yaml @@ -63,8 +63,6 @@ spec: - "-c" - | cp -r /data/workspace/frontend/* /tmp/frontend/ - sysctl -w net.ipv4.tcp_tw_reuse=0 - sysctl -w net.ipv4.tcp_max_tw_buckets=16384 containers: - name: gateway image: {{ include "bkci-gateway.image" . }} diff --git a/helm-charts/core/ci/templates/init/init.bkrepo.yaml b/helm-charts/core/ci/templates/init/init.bkrepo.yaml index ef3035e3f68..9d16cb9dd4e 100644 --- a/helm-charts/core/ci/templates/init/init.bkrepo.yaml +++ b/helm-charts/core/ci/templates/init/init.bkrepo.yaml @@ -33,7 +33,7 @@ spec: REPO_CREATE_GENERIC_PATH="{{ .Values.config.bkRepoApiUrl }}/repository/api/repo/create" REPO_INIT_GENERIC_METADATA_PATH="{{ .Values.config.bkRepoApiUrl }}/generic/" create_repo_project_name_init_plugintransfer_project_generic (){ - for i in bk-store + for i in bk-store bkcdn do ret=0 echo "CI project is $i -------------------------------------------------->" diff --git a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/UserCacheService.kt b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/UserCacheService.kt index a0e173a0b0d..12714f03ff5 100644 --- a/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/UserCacheService.kt +++ b/src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/service/UserCacheService.kt @@ -44,7 +44,7 @@ class UserCacheService @Autowired constructor( */ fun getDetailFromCache(userId: String): UserDeptDetail { val userRecord = userDao.get(dslContext, userId) - return getUserDeptDetail(userRecord) + return getUserDeptDetail(userRecord, userId) } fun listDetailFromCache(userIds: List): List { @@ -55,9 +55,10 @@ class UserCacheService @Autowired constructor( return userDao.usernamesByParentId(dslContext, parentId) } - fun getUserDeptDetail(userRecord: TUserRecord?): UserDeptDetail { + fun getUserDeptDetail(userRecord: TUserRecord?, userId: String? = null): UserDeptDetail { return if (userRecord == null) { UserDeptDetail( + userId = userId, bgName = "", bgId = "0", centerName = "", diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json index 48ea2127c95..d7df19505aa 100644 --- a/src/frontend/locale/pipeline/en-US.json +++ b/src/frontend/locale/pipeline/en-US.json @@ -1212,7 +1212,7 @@ "pipelineGroupAuth": "Permissions", "renameSuccess": "Pipeline Group {0} Rename Success", "deleteGroupTitle": "Confirm to delete 【{0}】?", - "deleteGroupTips": "The pipelines in the group are not deleted;", + "deleteGroupTips": "The pipelines in the group are not deleted", "groupStrategy": "Group Management Strategy", "staticGroup": "Static Group", "dynamicGroup": "Dynamic Group", @@ -1545,4 +1545,4 @@ "runningSteps": "Running steps: ", "completeness": "Completeness: ", "pacDesc": "Pipeline as Code mode, referred to as PAC mode. After enabling and submitting the pipeline file to the code base, you can maintain the pipeline by maintaining the code base file." -} \ No newline at end of file +}