Merge pull request #8023 from wcy00000000000000/v3.13.x

将bkRepoUrl配置更新为bkSharedResUrl
TencentBlueKing · Jun 13, 2024 · f6085b3 · f6085b3
2 parents 4e2af1e + be02565
commit f6085b3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/docs/support-file/helm/templates/adminserver/configmap.yaml b/docs/support-file/helm/templates/adminserver/configmap.yaml
@@ -64,8 +64,8 @@ data:
         bkDomain: {{ .Values.common.webServer.site.bkDomain }}
         #帮助文档地址
         helpDocUrl: {{ .Values.common.webServer.site.helpDocUrl }}
-        # 蓝鲸制品库URL
-        bkRepoUrl: {{ .Values.bkRepoUrl }}
+        # 蓝鲸共享资源URL
+        bkSharedResUrl: {{ .Values.bkSharedResUrl }}
         paas:
           # pass的tls相关配置
           tls:

diff --git a/docs/support-file/helm/values.yaml b/docs/support-file/helm/values.yaml
@@ -1148,8 +1148,8 @@ bkGseApiGatewayUrl: "http://bkapi.example.com"
 # 蓝鲸 Notice API Gateway url
 bkNoticeApiGatewayUrl: "http://bkapi.example.com"
 
-## 蓝鲸制品库URL
-bkRepoUrl: http://bkrepo.example.com
+## 蓝鲸共享资源URL
+bkSharedResUrl:
 
 ## @section bk-cmdb common config parameters
 ##

diff --git a/src/web_server/app/options/options.go b/src/web_server/app/options/options.go
@@ -73,8 +73,8 @@ type Site struct {
 	// the corresponding front-end variable is: componentApiUrl.
 	BkComponentApiUrl string
 	HelpDocUrl        string
-	// BkRepoUrl is the blueking repo url
-	BkRepoUrl string
+	// BkSharedResUrl is the blueking shared resource url
+	BkSharedResUrl string
 }
 
 // Config TODO

diff --git a/src/web_server/app/server.go b/src/web_server/app/server.go
@@ -153,7 +153,7 @@ func (w *WebServer) onServerConfigUpdate(previous, current cc.ProcessConfig) {
 	w.Config.Site.BkDomain, _ = cc.String("webServer.site.bkDomain")
 	w.Config.Site.HelpDocUrl, _ = cc.String("webServer.site.helpDocUrl")
 	w.Config.Site.BkComponentApiUrl, _ = cc.String("webServer.site.bkComponentApiUrl")
-	w.Config.Site.BkRepoUrl, _ = cc.String("webServer.site.bkRepoUrl")
+	w.Config.Site.BkSharedResUrl, _ = cc.String("webServer.site.bkSharedResUrl")
 
 	w.Config.Session.Name, _ = cc.String("webServer.session.name")
 	w.Config.Session.MultipleOwner, _ = cc.String("webServer.session.multipleOwner")

diff --git a/src/web_server/service/index.go b/src/web_server/service/index.go
@@ -44,7 +44,7 @@ func (s *Service) Index(c *gin.Context) {
 		"cookieDomain":              s.Config.Site.BkDomain,
 		"componentApiUrl":           s.Config.Site.BkComponentApiUrl,
 		"enableNotification":        s.Config.EnableNotification,
-		"bkRepoUrl":                 s.Config.Site.BkRepoUrl,
+		"bkSharedResUrl":            s.Config.Site.BkSharedResUrl,
 	}
 
 	if s.Config.Site.PaasDomainUrl != "" {