From 3f515874085937fbe840fa67fbe70ceda60ecbcd Mon Sep 17 00:00:00 2001 From: crayon <873217631@qq.com> Date: Mon, 21 Aug 2023 21:27:07 +0800 Subject: [PATCH] =?UTF-8?q?sprintfix:=20=E5=8F=98=E9=87=8F=E8=A7=84?= =?UTF-8?q?=E8=8C=83=20&=20=E4=BF=AE=E5=A4=8D=E8=8A=82=E7=82=B9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=87=8D=E8=A3=85=E6=93=8D=E4=BD=9C=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=86=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/default.py | 2 +- env.py | 2 +- .../static/components/atoms/nodeman/create_task/v4_0.js | 4 ++-- .../static/components/atoms/nodeman/create_task/v5_0.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/default.py b/config/default.py index c9c183824f..107cd49663 100644 --- a/config/default.py +++ b/config/default.py @@ -807,7 +807,7 @@ def check_engine_admin_permission(request, *args, **kwargs): } # 加密 -if env.BKPAAS_CRYPTO_TYPE == "SHANGMI": +if env.BKPAAS_BK_CRYPTO_TYPE == "SHANGMI": BKCRYPTO_ASYMMETRIC_CIPHER_TYPE = bkcrypto_constants.AsymmetricCipherType.SM2.value BKCRYPTO.update( { diff --git a/env.py b/env.py index 95eee907e0..b64958306b 100644 --- a/env.py +++ b/env.py @@ -111,4 +111,4 @@ # 获取加密类型 -BKPAAS_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC" +BKPAAS_BK_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC" diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js index da1b241d35..ba487b09f4 100644 --- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js +++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js @@ -283,8 +283,8 @@ if (node_type === "PROXY") { self.columns.push(...proxy_columns); } - // 安装 / 卸载需要认证信息 - if (op_type === "INSTALL" || op_type === "UNINSTALL") { + // 安装 / 重装 / 卸载需要认证信息 + if (op_type === "INSTALL" || op_type === "UNINSTALL" || op_type === "REINSTALL") { self.columns.push(...auth_columns); } // 非卸载场景需要配置信息 diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js index 945e937d7b..cd9888e61e 100644 --- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js +++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js @@ -281,8 +281,8 @@ if (node_type === "PROXY") { self.columns.push(...proxy_columns); } - // 安装 / 卸载需要认证信息 - if (op_type === "INSTALL" || op_type === "UNINSTALL") { + // 安装 / 重装 / 卸载需要认证信息 + if (op_type === "INSTALL" || op_type === "UNINSTALL" || op_type === "REINSTALL") { self.columns.push(...auth_columns); } // 非卸载场景需要配置信息