From d194a29dbf24b3c71c7eeb43d3f35398a39a0a22 Mon Sep 17 00:00:00 2001 From: durant <826035498@qq.com> Date: Sat, 18 Nov 2023 21:00:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E4=BF=AE=E5=A4=8D=20medium=20?= =?UTF-8?q?=E6=89=93=E5=8C=85=E9=97=AE=E9=A2=98=20#1918?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/backend/dbm_init/medium/handlers.py | 4 +--- dbm-ui/backend/ticket/flow_manager/inner.py | 2 +- helm-charts/bk-dbm/Chart.yaml | 4 ++-- helm-charts/bk-dbm/charts/dbm/Chart.yaml | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dbm-ui/backend/dbm_init/medium/handlers.py b/dbm-ui/backend/dbm_init/medium/handlers.py index 36d6ea85fc..f4d4c13a10 100644 --- a/dbm-ui/backend/dbm_init/medium/handlers.py +++ b/dbm-ui/backend/dbm_init/medium/handlers.py @@ -19,9 +19,7 @@ import yaml from bkstorages.backends.bkrepo import TIMEOUT_THRESHOLD, BKGenericRepoClient, BKRepoStorage, urljoin -from django.conf import settings -from backend import env logger = logging.getLogger("root") @@ -128,7 +126,7 @@ def upload_medium(self, path, bkrepo_tmp_dir): for file in files: if "?" in file: continue - if env.RUN_VER == "ieod" and "dbbackup-go" in file: + if os.getenv("RUN_VER") == "ieod" and "dbbackup-go" in file: # 内部版本不自动上传 dbbackup continue diff --git a/dbm-ui/backend/ticket/flow_manager/inner.py b/dbm-ui/backend/ticket/flow_manager/inner.py index 34894685d8..6e49521856 100644 --- a/dbm-ui/backend/ticket/flow_manager/inner.py +++ b/dbm-ui/backend/ticket/flow_manager/inner.py @@ -93,7 +93,7 @@ def _status(self) -> str: @property def _url(self) -> str: - return f"/database/{self.ticket.bk_biz_id}/task-history/{self.root_id}/" + return f"/database/{self.ticket.bk_biz_id}/task-history/detail/{self.root_id}/" def check_exclusive_operations(self): """判断执行互斥""" diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml index 7d784816fa..516361bf6f 100644 --- a/helm-charts/bk-dbm/Chart.yaml +++ b/helm-charts/bk-dbm/Chart.yaml @@ -79,5 +79,5 @@ dependencies: description: A Helm chart for bkdbm name: bk-dbm type: application -version: 1.2.0-alpha.92 -appVersion: 1.2.0-alpha.92 +version: 1.2.0-alpha.93 +appVersion: 1.2.0-alpha.93 diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml index b0ece3fc1a..b9517fff60 100644 --- a/helm-charts/bk-dbm/charts/dbm/Chart.yaml +++ b/helm-charts/bk-dbm/charts/dbm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.2.0-alpha.510 +appVersion: 1.2.0-alpha.512 description: A Helm chart for dbm name: dbm type: application