Skip to content

feat: 请求上下文返回上报地址 --story=125100805 #7966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 5, 2025
Merged

feat: 请求上下文返回上报地址 --story=125100805 #7966

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
853432a
feat: 请求上下文返回上报地址 --story=125100805
guohelu Aug 1, 2025
26ce8b7
fix: 调整返回逻辑 --story=125100805
guohelu Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,3 +923,5 @@ def check_engine_admin_permission(request, *args, **kwargs):
# 允许的HTTP插件域名
ENABLE_HTTP_PLUGIN_DOMAINS_CHECK = env.ENABLE_HTTP_PLUGIN_DOMAINS_CHECK
ALLOWED_HTTP_PLUGIN_DOMAINS = env.ALLOWED_HTTP_PLUGIN_DOMAINS

BK_DATA_URL = env.BK_DATA_URL
1 change: 1 addition & 0 deletions config/prod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@
default.logging_addition_settings(LOGGING, environment="prod")

BK_APIGW_STAGE_NAME = "prod"
BK_DATA_URL_SUFFIX = "569747"
2 changes: 1 addition & 1 deletion config/stag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import env


# 预发布环境
RUN_MODE = "STAGING"

Expand All @@ -33,3 +32,4 @@
default.logging_addition_settings(LOGGING, environment="stag")

BK_APIGW_STAGE_NAME = "stage"
BK_DATA_URL_SUFFIX = "569035"
2 changes: 2 additions & 0 deletions env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,5 @@
# 允许的HTTP插件域名
ENABLE_HTTP_PLUGIN_DOMAINS_CHECK = bool(int(os.getenv("ENABLE_HTTP_PLUGIN_DOMAINS_CHECK", 1)))
ALLOWED_HTTP_PLUGIN_DOMAINS = os.getenv("ALLOWED_HTTP_PLUGIN_DOMAINS", "")

BK_DATA_URL = os.getenv("BK_DATA_URL", "")
1 change: 1 addition & 0 deletions gcloud/core/context_processors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def mysetting(request):
"ENABLE_NOTICE_CENTER": enable_notice_center,
"BK_PAAS_SHARED_RES_URL": env.BKPAAS_SHARED_RES_URL,
"TASK_LIST_STATUS_FILTER_DAYS": settings.TASK_LIST_STATUS_FILTER_DAYS,
"BK_DATA_URL": settings.BK_DATA_URL + f"/v4/report_data/{settings.BK_DATA_URL_SUFFIX}/",
}

# custom context config
Expand Down
Loading