From 0f46256d9d5a561bd9d926baf253614ae509ed72 Mon Sep 17 00:00:00 2001 From: ambition <39669748+Ambition9186@users.noreply.github.com> Date: Wed, 19 Jun 2024 10:48:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=89=8D=E7=AB=AF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=8A=82=E7=82=B9=E7=AE=A1=E7=90=86url=20(#3?= =?UTF-8?q?289)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bcs-services/bcs-bscp/cmd/ui/service/web.go | 2 ++ bcs-services/bcs-bscp/embed.go | 2 ++ bcs-services/bcs-bscp/pkg/config/base.go | 1 + bcs-services/bcs-bscp/pkg/config/frontend.go | 7 ++++--- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bcs-services/bcs-bscp/cmd/ui/service/web.go b/bcs-services/bcs-bscp/cmd/ui/service/web.go index 939a51d2ab..2821b0d053 100644 --- a/bcs-services/bcs-bscp/cmd/ui/service/web.go +++ b/bcs-services/bcs-bscp/cmd/ui/service/web.go @@ -184,6 +184,8 @@ func (s *WebServer) subRouter() http.Handler { CMDBHost: config.G.Frontend.Host.BKCMDBHost, EnableBKNotice: config.G.Frontend.EnableBKNotice, Helper: config.G.Frontend.Helper, + FeedAddr: config.G.Base.FeedAddr, + NodeManHost: config.G.Frontend.Host.BKNODEMANHOST, } if shouldProxyAPI { diff --git a/bcs-services/bcs-bscp/embed.go b/bcs-services/bcs-bscp/embed.go index 0a36e39c2f..73b3dd8a84 100644 --- a/bcs-services/bcs-bscp/embed.go +++ b/bcs-services/bcs-bscp/embed.go @@ -57,6 +57,7 @@ type IndexConfig struct { Helper string ProxyAPI bool FeedAddr string + NodeManHost string } // EmbedWebServer 前端 web server @@ -168,6 +169,7 @@ func (e *EmbedWeb) RenderIndexHandler(conf *IndexConfig) http.Handler { "ENABLE_BK_NOTICE": strconv.FormatBool(conf.EnableBKNotice), "HELPER": conf.Helper, "FEED_ADDR": conf.FeedAddr, + "BK_NODE_HOST": conf.NodeManHost, } // 本地开发模式 / 代理请求 diff --git a/bcs-services/bcs-bscp/pkg/config/base.go b/bcs-services/bcs-bscp/pkg/config/base.go index 999bd1d284..4f2250e84e 100644 --- a/bcs-services/bcs-bscp/pkg/config/base.go +++ b/bcs-services/bcs-bscp/pkg/config/base.go @@ -34,6 +34,7 @@ type BaseConf struct { TimeZone string `yaml:"time_zone"` LanguageCode string `yaml:"language_code"` RunEnv string `yaml:"run_env"` + FeedAddr string `yaml:"feed_addr"` Location *time.Location `yaml:"-"` } diff --git a/bcs-services/bcs-bscp/pkg/config/frontend.go b/bcs-services/bcs-bscp/pkg/config/frontend.go index ad2abe8372..ab0961b733 100644 --- a/bcs-services/bcs-bscp/pkg/config/frontend.go +++ b/bcs-services/bcs-bscp/pkg/config/frontend.go @@ -15,9 +15,10 @@ package config // HostConf host conf type HostConf struct { - BKIAMHost string `yaml:"bk_iam_host"` // 权限中心 - BKCMDBHost string `yaml:"bk_cmdb_host"` // 配置平台 - BSCPAPIURL string `yaml:"bscp_api_url"` // bscp api地址 + BKIAMHost string `yaml:"bk_iam_host"` // 权限中心 + BKCMDBHost string `yaml:"bk_cmdb_host"` // 配置平台 + BSCPAPIURL string `yaml:"bscp_api_url"` // bscp api地址 + BKNODEMANHOST string `yaml:"bk_nodeman_host"` // 节点管理地址 } // FrontendConf docs and host conf