From 618f2bc22524eb843aae6e2c6b06aea95878ca45 Mon Sep 17 00:00:00 2001 From: Xinkai Yi Date: Tue, 10 Feb 2026 20:52:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=85=8D=E7=BD=AE=E5=8F=98=E9=87=8F=20--stor?= =?UTF-8?q?y=3D130029401?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bk_plugin_runtime/config/default.py | 23 +++++++++++++++---- .../bk_plugin_runtime/config/stag.py | 8 +++---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py index fd187b3..5837012 100644 --- a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py +++ b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py @@ -250,7 +250,7 @@ def logging_addition_settings(logging_dict): # 网关管理员，请将负责人加入列表中 BK_APIGW_MAINTAINERS = [m.strip() for m in os.getenv("BK_APIGW_MAINTAINERS", "admin").split(",") if m.strip()] # 网关接口最大超时时间 -BK_APIGW_STAG_BACKEND_TIMEOUT = 60 +BK_APIGW_STAG_BACKEND_TIMEOUT = int(os.getenv("BK_APIGW_DEFAULT_TIMEOUT", "60")) # analysis the app environment and address via bkpaas env vars @@ -269,8 +269,24 @@ def logging_addition_settings(logging_dict): # 网关同步 API 文档语言, zh/en, 如果配置了BK_APIGW_RESOURCE_DOCS_BASE_DIR（使用自定义文档）, 那么必须将这个变量置空 BK_APIGW_RELEASE_DOC_LANGUAGE = os.getenv("BK_APIGW_RELEASE_DOC_LANGUAGE", "") # 在项目 docs目录下，通过 markdown文档自动化导入中英文文档; 注意markdown文件名必须等于接口的 operation_id; 见 demo 示例 -# BK_APIGW_RESOURCE_DOCS_BASE_DIR = env.str("BK_APIGW_RESOURCE_DOCS_BASE_DIR", default=BASE_DIR / "docs") - +BK_APIGW_RESOURCE_DOCS_BASE_DIR = os.getenv("BK_APIGW_RESOURCE_DOCS_BASE_DIR", default=os.path.join(BASE_DIR, "docs")) + +# NOTE: 根据 BKPAAS_ENVIRONMENT 自动设置 stage name +# stag 环境对应 stag，其他环境（prod、dev）对应 prod +BK_APIGW_STAGE_NAME = os.getenv("BK_APIGW_STAGE_NAME", "stag" if BKPAAS_ENVIRONMENT == "stag" else "prod") + +BK_APIGW_RELEASE_VERSION = ( + # NOTE: 每次部署必须强制版本号变更，否则代码变更版本号不变，不会打出新版本 + # log: resource_version 1.0.3+stag already exists, skip creating + os.getenv("BK_APIGW_RELEASE_VERSION", default="1.0.0") + + "+" + + BK_APIGW_STAGE_NAME +) +BK_APIGW_RELEASE_TITLE = os.getenv("BK_APIGW_RELEASE_TITLE", default=f"gateway release(stage={BK_APIGW_STAGE_NAME})") +BK_APIGW_RELEASE_COMMENT = os.getenv( + "BK_APIGW_RELEASE_COMMENT", + default=f"auto release by bk-apigw-plugin-runtime(stage={BK_APIGW_STAGE_NAME})", +) # BK SOPS RELATE BK_SOPS_APP_CODE = os.getenv("BK_SOPS_APP_CODE") @@ -303,7 +319,6 @@ def logging_addition_settings(logging_dict): BK_APIGW_CORS_ALLOW_ORIGINS = os.getenv("BK_APIGW_CORS_ALLOW_ORIGINS", "") BK_APIGW_CORS_ALLOW_METHODS = os.getenv("BK_APIGW_CORS_ALLOW_METHODS", "") BK_APIGW_CORS_ALLOW_HEADERS = os.getenv("BK_APIGW_CORS_ALLOW_HEADERS", "") -BK_APIGW_DEFAULT_TIMEOUT = int(os.getenv("BK_APIGW_DEFAULT_TIMEOUT", "60")) BK_APIGW_GRANT_PERMISSION_DIMENSION_GATEWAY_APP_CODES = [BK_APP_CODE] + [ each.strip() for each in os.getenv("BK_APIGW_GRANTED_APPS", "").split(",") if each.strip() ] diff --git a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/stag.py b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/stag.py index 118df04..9542f07 100644 --- a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/stag.py +++ b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/stag.py @@ -18,10 +18,10 @@ else: from blueapps.patch.settings_paas_services import * # noqa -# 开发环境网关配置 -BK_APIGW_STAGE_NAME = "dev" -BK_APIGW_STAGE_DESCRIPTION = "开发环境" -BK_APIGW_STAGE_DESCRIPTION_EN = "Development Env" +# 预发布环境网关配置 +BK_APIGW_STAGE_NAME = "stag" +BK_APIGW_STAGE_DESCRIPTION = "预发布环境" +BK_APIGW_STAGE_DESCRIPTION_EN = "Staging Env" # 预发布环境网关环境变量 BK_APIGW_STAGE_ENV_VARS = {"foo": "bar"} From 7ab9eaf0056e815e3f3d41ea699cd3f2b6317693 Mon Sep 17 00:00:00 2001 From: Xinkai Yi Date: Thu, 12 Mar 2026 17:55:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=8F=98=E9=87=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0#=20noqa=E6=B3=A8=E9=87=8A=20=20--story=3D130?= =?UTF-8?q?029401?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py index 5837012..381a2ed 100644 --- a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py +++ b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py @@ -269,7 +269,9 @@ def logging_addition_settings(logging_dict): # 网关同步 API 文档语言, zh/en, 如果配置了BK_APIGW_RESOURCE_DOCS_BASE_DIR（使用自定义文档）, 那么必须将这个变量置空 BK_APIGW_RELEASE_DOC_LANGUAGE = os.getenv("BK_APIGW_RELEASE_DOC_LANGUAGE", "") # 在项目 docs目录下，通过 markdown文档自动化导入中英文文档; 注意markdown文件名必须等于接口的 operation_id; 见 demo 示例 -BK_APIGW_RESOURCE_DOCS_BASE_DIR = os.getenv("BK_APIGW_RESOURCE_DOCS_BASE_DIR", default=os.path.join(BASE_DIR, "docs")) +BK_APIGW_RESOURCE_DOCS_BASE_DIR = os.getenv( + "BK_APIGW_RESOURCE_DOCS_BASE_DIR", default=os.path.join(BASE_DIR, "docs") +) # noqa # NOTE: 根据 BKPAAS_ENVIRONMENT 自动设置 stage name # stag 环境对应 stag，其他环境（prod、dev）对应 prod From 8cd81a9af12f7eec4628163d57ed0f152cd416ad Mon Sep 17 00:00:00 2001 From: Xinkai Yi Date: Thu, 12 Mar 2026 17:59:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=8F=98=E9=87=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0#=20noqa=E6=B3=A8=E9=87=8A=20=20--story=3D130?= =?UTF-8?q?029401?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py index 381a2ed..253c34b 100644 --- a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py +++ b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py @@ -93,7 +93,7 @@ # STATIC_VERSION = "1.0" -STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] # noqa +STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] # noqa: F405 # CELERY 开关，使用时请改为 True，修改项目目录下的 Procfile 文件，添加以下两行命令： # worker: python manage.py celery worker -l info @@ -270,7 +270,7 @@ def logging_addition_settings(logging_dict): BK_APIGW_RELEASE_DOC_LANGUAGE = os.getenv("BK_APIGW_RELEASE_DOC_LANGUAGE", "") # 在项目 docs目录下，通过 markdown文档自动化导入中英文文档; 注意markdown文件名必须等于接口的 operation_id; 见 demo 示例 BK_APIGW_RESOURCE_DOCS_BASE_DIR = os.getenv( - "BK_APIGW_RESOURCE_DOCS_BASE_DIR", default=os.path.join(BASE_DIR, "docs") + "BK_APIGW_RESOURCE_DOCS_BASE_DIR", default=os.path.join(BASE_DIR, "docs") # noqa ) # noqa # NOTE: 根据 BKPAAS_ENVIRONMENT 自动设置 stage name From 7885c36572cd888e42ad500041d178202de56aac Mon Sep 17 00:00:00 2001 From: Xinkai Yi Date: Thu, 12 Mar 2026 17:59:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=8F=98=E9=87=8F=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0#=20noqa=E6=B3=A8=E9=87=8A=20=20--story=3D130?= =?UTF-8?q?029401?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py index 253c34b..28e85cb 100644 --- a/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py +++ b/runtime/bk-plugin-runtime/bk_plugin_runtime/config/default.py @@ -126,7 +126,7 @@ IS_AJAX_PLAIN_MODE = False # 国际化配置 -LOCALE_PATHS = (os.path.join(BASE_DIR, "locale"),) # noqa +LOCALE_PATHS = (os.path.join(BASE_DIR, "locale"),) # noqa: F405 TIME_ZONE = "Asia/Shanghai" LANGUAGE_CODE = "zh-hans"