From bc1994c87552e39278ac6bfed577bc311608fa20 Mon Sep 17 00:00:00 2001 From: jpyoung3 <809608046@qq.com> Date: Fri, 20 Dec 2024 15:29:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=89=E8=A3=85=E9=A2=84=E8=AE=BE?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=94=81=E5=AE=9A=E7=89=88=E6=9C=AC(closed?= =?UTF-8?q?=20#2482)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/backend/subscription/steps/adapter.py | 2 +- apps/node_man/constants.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/backend/subscription/steps/adapter.py b/apps/backend/subscription/steps/adapter.py index 62fa2e6d3a..8730757468 100644 --- a/apps/backend/subscription/steps/adapter.py +++ b/apps/backend/subscription/steps/adapter.py @@ -501,7 +501,7 @@ def get_matching_config_tmpl_objs( return self.config_tmpl_obj_gby_os_key.get(self.get_os_key(os_type, cpu_arch), []) def check_biz_version(self, package: models.Packages, bk_biz_id: int): - # 如果设定了业务最大版本，则判断当前版本是否大于业务设定的最大版本 + """如果设定了业务最大版本，则判断当前版本是否大于业务设定的最大版本""" plugin_version_config = self.plugin_version_config() if str(bk_biz_id) in plugin_version_config: biz_version_config = plugin_version_config[str(bk_biz_id)] diff --git a/apps/node_man/constants.py b/apps/node_man/constants.py index f15d11c3c9..cde490d4ae 100644 --- a/apps/node_man/constants.py +++ b/apps/node_man/constants.py @@ -77,7 +77,7 @@ class TimeUnit: DEFAULT_CLOUD = int(os.environ.get("DEFAULT_CLOUD", 0)) DEFAULT_CLOUD_NAME = os.environ.get("DEFAULT_CLOUD_NAME", _("直连区域")) # 未分配管控区域ID -UNASSIGNED_CLOUD_ID = int(os.environ.get("BKAPP_UNASSIGNED_CLOUD_ID", 90000001)) +UNASSIGNED_CLOUD_ID = int(float(os.environ.get("BKAPP_UNASSIGNED_CLOUD_ID", 90000001))) # 自动选择接入点ID DEFAULT_AP_ID = int(os.environ.get("DEFAULT_AP_ID", -1)) # 自动选择安装通道ID