diff --git a/helm-charts/core/ci/base/default_env.yaml b/helm-charts/core/ci/base/default_env.yaml index 4ce130f39ca..3f3ea4e5f6b 100644 --- a/helm-charts/core/ci/base/default_env.yaml +++ b/helm-charts/core/ci/base/default_env.yaml @@ -43,3 +43,4 @@ bkCiNotifyEmailSendChannel: blueking bkCiInitLocale: zh-CN bkCiRedisSsl: false bkCiEsHttps: false +bkCiFrontendIndex: "rewrite .* /$subsystem/index.html break" diff --git a/scripts/bkenv.properties b/scripts/bkenv.properties index f302752327e..3b3e0a43ac5 100644 --- a/scripts/bkenv.properties +++ b/scripts/bkenv.properties @@ -113,6 +113,8 @@ BK_CI_STREAM_HOST=devops.example.com BK_CI_CLUSTER_TAG=devops # BK_CI_DEVOPS_TOKEN BK_CI_DEVOPS_TOKEN=devops +# BK_CI_FRONTEND_INDEX +BK_CI_FRONTEND_INDEX="rewrite .* /$subsystem/index.html break" ########## # 2-公共依赖 diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/view/PipelineViewGroupService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/view/PipelineViewGroupService.kt index 0fa1678a11c..f3e7da33801 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/view/PipelineViewGroupService.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/view/PipelineViewGroupService.kt @@ -40,6 +40,7 @@ import com.tencent.devops.common.client.ClientTokenService import com.tencent.devops.common.pipeline.enums.ChannelCode import com.tencent.devops.common.redis.RedisOperation import com.tencent.devops.common.service.utils.LogUtils +import com.tencent.devops.common.service.utils.MessageCodeUtil import com.tencent.devops.common.util.PinyinUtil import com.tencent.devops.model.process.tables.records.TPipelineInfoRecord import com.tencent.devops.model.process.tables.records.TPipelineViewRecord @@ -494,7 +495,7 @@ class PipelineViewGroupService @Autowired constructor( projectViewList.add( PipelineViewDict.ViewInfo( viewId = PIPELINE_VIEW_UNCLASSIFIED, - viewName = "未分组", + viewName = ungroupedName(), pipelineList = pipelineInfoMap.values .filterNot { classifiedPipelineIds.contains(it.pipelineId) } .map { @@ -658,7 +659,7 @@ class PipelineViewGroupService @Autowired constructor( 0, PipelineNewViewSummary( id = PIPELINE_VIEW_UNCLASSIFIED, projectId = projectId, - name = "未分组", + name = ungroupedName(), projected = true, createTime = LocalDateTime.now().timestamp(), updateTime = LocalDateTime.now().timestamp(), @@ -756,6 +757,8 @@ class PipelineViewGroupService @Autowired constructor( } } + private fun ungroupedName() = MessageCodeUtil.getMessageByLocale("未分组", "Ungrouped") + companion object { private val logger = LoggerFactory.getLogger(PipelineViewGroupService::class.java) } diff --git a/src/gateway/core/frontend.conf b/support-files/templates/gateway#core#frontend.conf similarity index 97% rename from src/gateway/core/frontend.conf rename to support-files/templates/gateway#core#frontend.conf index 924ea1d4ac2..dfebfc5fe78 100644 --- a/src/gateway/core/frontend.conf +++ b/support-files/templates/gateway#core#frontend.conf @@ -55,5 +55,5 @@ if ($uri ~* ^/(\w+)) { set $subsystem $1; } - rewrite .* /$subsystem/index.html break; + __BK_CI_FRONTEND_INDEX__ ; }