From 6541cd9f5fe6b9d850bfd23e2492d939dc5fe066 Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 24 Feb 2023 15:09:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20web=20gui=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/connect_methods.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/terminal/connect_methods.py b/apps/terminal/connect_methods.py index 944439ff1..3ad407d77 100644 --- a/apps/terminal/connect_methods.py +++ b/apps/terminal/connect_methods.py @@ -17,17 +17,17 @@ class WebMethod(TextChoices): @classmethod def get_methods(cls): - return { + methods = { Protocol.ssh: [cls.web_cli, cls.web_sftp], Protocol.telnet: [cls.web_cli], Protocol.rdp: [cls.web_gui], Protocol.vnc: [cls.web_gui], - Protocol.mysql: [cls.web_cli, cls.web_gui], - Protocol.mariadb: [cls.web_cli, cls.web_gui], - Protocol.oracle: [cls.web_cli, cls.web_gui], - Protocol.postgresql: [cls.web_cli, cls.web_gui], - Protocol.sqlserver: [cls.web_cli, cls.web_gui], + Protocol.mysql: [cls.web_cli], + Protocol.mariadb: [cls.web_cli], + Protocol.oracle: [cls.web_cli], + Protocol.postgresql: [cls.web_cli], + Protocol.sqlserver: [cls.web_cli], Protocol.redis: [cls.web_cli], Protocol.mongodb: [cls.web_cli], Protocol.clickhouse: [cls.web_cli], @@ -35,6 +35,13 @@ class WebMethod(TextChoices): Protocol.k8s: [cls.web_cli], Protocol.http: [] } + if not settings.XPACK_ENABLED: + return methods + + web_gui_dbs = [Protocol.mysql, Protocol.mariadb, Protocol.oracle, Protocol.postgresql] + for db in web_gui_dbs: + methods[db].append(cls.web_gui) + return methods class NativeClient(TextChoices):