fix: 修复返回feed-server服务相关配置 (#3396)

TencentBlueKing · Jul 24, 2024 · 10c181d · 10c181d
1 parent e523a34
commit 10c181d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/bcs-services/bcs-bscp/cmd/ui/service/web.go b/bcs-services/bcs-bscp/cmd/ui/service/web.go
@@ -185,9 +185,8 @@ func (s *WebServer) subRouter() http.Handler {
 		BKSharedResBaseJSURL: config.G.Frontend.Host.BKSharedResBaseJSURL,
 		EnableBKNotice:       config.G.Frontend.EnableBKNotice,
 		Helper:               config.G.Frontend.Helper,
-		FeedHost:             config.G.Base.FeedHost,
-		FeedGrpcPort:         config.G.Base.FeedGrpcPort,
-		FeedHttpPort:         config.G.Base.FeedHttpPort,
+		GrpcAddr:             config.G.Base.GrpcAddr,
+		HttpAddr:             config.G.Base.HttpAddr,
 		NodeManHost:          config.G.Frontend.Host.BKNODEMANHOST,
 	}
 

diff --git a/bcs-services/bcs-bscp/embed.go b/bcs-services/bcs-bscp/embed.go
@@ -56,9 +56,8 @@ type IndexConfig struct {
 	EnableBKNotice       bool   // 是否启用蓝鲸通知中心
 	Helper               string
 	ProxyAPI             bool
-	FeedHost             string // feed-server 地址
-	FeedGrpcPort         uint   // feed-server grpc 端口
-	FeedHttpPort         uint   // feed-server http 端口
+	GrpcAddr             string // feed-server grpc 地址
+	HttpAddr             string // feed-server http 地址
 	BKSharedResBaseJSURL string // 规则是${bkSharedResUrl}/${目录名 aka app_code}/base.js
 	NodeManHost          string
 }
@@ -172,9 +171,8 @@ func (e *EmbedWeb) RenderIndexHandler(conf *IndexConfig) http.Handler {
 			"SITE_URL":                  conf.SiteURL,
 			"ENABLE_BK_NOTICE":          conf.EnableBKNotice,
 			"HELPER":                    conf.Helper,
-			"FEED_HOST":                 conf.FeedHost,
-			"FEED_GRPC_PORT":            conf.FeedGrpcPort,
-			"FEED_HTTP_PORT":            conf.FeedHttpPort,
+			"GRPC_ADDR":                 conf.GrpcAddr,
+			"HTTP_ADDR":                 conf.HttpAddr,
 			"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,9 +34,8 @@ type BaseConf struct {
 	TimeZone     string         `yaml:"time_zone"`
 	LanguageCode string         `yaml:"language_code"`
 	RunEnv       string         `yaml:"run_env"`
-	FeedHost     string         `yaml:"feed_host"`
-	FeedGrpcPort uint           `yaml:"feed_grpc_port"`
-	FeedHttpPort uint           `yaml:"feed_http_port"`
+	GrpcAddr     string         `yaml:"grpc_addr"`
+	HttpAddr     string         `yaml:"http_addr"`
 	Location     *time.Location `yaml:"-"`
 }