feat: 添加 BKPAAS_NODEMAN_URL 等内置环境变量&修改开发框架文档路径 (#1597)

TencentBlueKing · Sep 12, 2024 · b09396f · b09396f
1 parent 4e10693
commit b09396f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/apiserver/paasng/conf.yaml.tpl b/apiserver/paasng/conf.yaml.tpl
@@ -308,6 +308,14 @@
 # BK_TURBO_URL: ''
 ## 蓝盾流水线服务地址
 # BK_PIPELINE_URL: ''
+## 蓝鲸节点管理平台地址
+# BK_NODEMAN_URL: ''
+## 蓝鲸容器管理平台地址
+# BK_BCS_URL: ''
+## 蓝鲸服务配置中心地址
+# BK_BSCP_URL: ''
+## 蓝鲸审计中心地址
+# BK_AUDIT_URL: ''
 ## 其他蓝鲸服务地址，格式如：{"BK_SOPS_URL": "http://localhost:8080"}
 # BK_PLATFORM_URLS: {}
 

diff --git a/apiserver/paasng/fixtures/smart_advisor.yaml b/apiserver/paasng/fixtures/smart_advisor.yaml
@@ -4,7 +4,7 @@
             title_en: "Guide to building a local Python development environment",
             short_description_zh_cn: '',
             short_description_en: '',
-            location: '{doc_url_prefix}/markdown/PaaS/DevelopTools/BaseGuide/topics/company_tencent/python_framework_usage#python',
+            location: '{doc_url_prefix}/markdown/PaaS/DevelopTools/BaseGuide/quickstart/python/python_setup_dev',
             affinity_tags: '["app-pl:python","plat-panel:app_created"]', anti_affinity_tags: '[]',
             priority: 1, created: !!timestamp '2020-08-20 11:08:51+00:00' }
 - model: smart_advisor.documentarylink

diff --git a/apiserver/paasng/paasng/platform/engine/configurations/config_var.py b/apiserver/paasng/paasng/platform/engine/configurations/config_var.py
@@ -186,6 +186,10 @@ def generate_env_vars_for_bk_platform(config_vars_prefix: str) -> Dict[str, str]
         "CODECC_URL": settings.BK_CODECC_URL,
         "TURBO_URL": settings.BK_TURBO_URL,
         "PIPELINE_URL": settings.BK_PIPELINE_URL,
+        "NODEMAN_URL": settings.BK_NODEMAN_URL,
+        "BCS_URL": settings.BK_BCS_URL,
+        "BSCP_URL": settings.BK_BSCP_URL,
+        "AUDIT_URL": settings.BK_AUDIT_URL,
         "SHARED_RES_URL": settings.BK_SHARED_RES_URL,
     }
     # 系统环境变量需要添加统一的前缀

diff --git a/apiserver/paasng/paasng/settings/__init__.py b/apiserver/paasng/paasng/settings/__init__.py
@@ -806,6 +806,10 @@ def _build_file_handler(log_path: Path, filename: str, format: str) -> Dict:
 BK_CODECC_URL = settings.get("BK_CODECC_URL", "")
 BK_TURBO_URL = settings.get("BK_TURBO_URL", "")
 BK_PIPELINE_URL = settings.get("BK_PIPELINE_URL", "")
+BK_NODEMAN_URL = settings.get("BK_NODEMAN_URL", "")
+BK_BCS_URL = settings.get("BK_BCS_URL", "")
+BK_BSCP_URL = settings.get("BK_BSCP_URL", "")
+BK_AUDIT_URL = settings.get("BK_AUDIT_URL", "")
 # 蓝鲸产品 title/footer/name/logo 等资源自定义配置的路径
 BK_SHARED_RES_URL = settings.get("BK_SHARED_RES_URL", "")
 

diff --git a/webfe/package_vue/static/json/paas_static.ce.js b/webfe/package_vue/static/json/paas_static.ce.js
@@ -154,7 +154,7 @@ export const PLATFORM_CONFIG = {
         API_HELP: BK_APIGW_DOC_URL,
 
         // Python 开发框架（blueapps）- 框架文档
-        PYTHON_FRAMEWORK: DOCS_URL_PREFIX + '/topics/company_tencent/python_framework_usage',
+        PYTHON_FRAMEWORK: BK_DOCS_URL_PREFIX + '/markdown/PaaS/DevelopTools/SaaSGuide/DevBasics/README.md',
 
         // Go 开发框架- 快速开始
         GO_START: DOCS_URL_PREFIX + '/quickstart/golang/golang_preparations',
@@ -549,7 +549,7 @@ export const PAAS_STATIC_CONFIG = {
                 "list": [
                     {
                         "title": staticI18n.$t("如何使用蓝鲸开发框架？"),
-                        "url": DOCS_URL_PREFIX + "/topics/company_tencent/python_framework_usage",
+                        "url": BK_DOCS_URL_PREFIX + "/markdown/PaaS/DevelopTools/SaaSGuide/DevBasics/README.md",
                         "info": staticI18n.$t("集成登录鉴权、安全防护、权限控制等基础模块，更有后台任务、云API调用等样例供您参考")
                     },
                     {

diff --git a/webfe/package_vue/static/json/paas_static.ee.js b/webfe/package_vue/static/json/paas_static.ee.js
@@ -154,7 +154,7 @@ export const PLATFORM_CONFIG = {
         API_HELP: BK_APIGW_DOC_URL,
 
         // Python 开发框架（blueapps）- 框架文档
-        PYTHON_FRAMEWORK: DOCS_URL_PREFIX + '/topics/company_tencent/python_framework_usage',
+        PYTHON_FRAMEWORK: BK_DOCS_URL_PREFIX + '/markdown/PaaS/DevelopTools/SaaSGuide/DevBasics/README.md',
 
         // Go 开发框架- 快速开始
         GO_START: DOCS_URL_PREFIX + '/quickstart/golang/golang_preparations',
@@ -557,7 +557,7 @@ export const PAAS_STATIC_CONFIG = {
                 "list": [
                     {
                         "title": staticI18n.$t("如何使用蓝鲸开发框架？"),
-                        "url": DOCS_URL_PREFIX + "/topics/company_tencent/python_framework_usage",
+                        "url": BK_DOCS_URL_PREFIX + "/markdown/PaaS/DevelopTools/SaaSGuide/DevBasics/README.md",
                         "info": staticI18n.$t("集成登录鉴权、安全防护、权限控制等基础模块，更有后台任务、云API调用等样例供您参考")
                     },
                     {