feat: 前端配置返回节点管理url (TencentBlueKing#3289)

Maclon9573 · Jun 25, 2024 · 0f46256 · 0f46256
1 parent 487e8b6
commit 0f46256
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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