From 9eef13609b615a9f9b27da42cbec08c04c033885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 17 Jun 2024 20:43:49 +0800 Subject: [PATCH] fix(webconsole): sangfor vnc (#20562) --- cmd/climc/shell/misc/feature.go | 1 + pkg/apis/webconsole/consts.go | 1 + pkg/webconsole/server/server.go | 1 + pkg/webconsole/session/remote_console.go | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/climc/shell/misc/feature.go b/cmd/climc/shell/misc/feature.go index 05e5e0d032..f563eb5e7d 100644 --- a/cmd/climc/shell/misc/feature.go +++ b/cmd/climc/shell/misc/feature.go @@ -101,6 +101,7 @@ func init() { "qingcloud", "volcengine", "oraclecloud", + "sangfor", } const ( diff --git a/pkg/apis/webconsole/consts.go b/pkg/apis/webconsole/consts.go index 5fdaabfc86..b5a9bbce0b 100644 --- a/pkg/apis/webconsole/consts.go +++ b/pkg/apis/webconsole/consts.go @@ -38,4 +38,5 @@ const ( CLOUDPODS = "cloudpods" PROXMOX = "proxmox" VOLC_ENGINE = "volcengine" + SANGFOR = "sangfor" ) diff --git a/pkg/webconsole/server/server.go b/pkg/webconsole/server/server.go index 9601537300..48e5878520 100644 --- a/pkg/webconsole/server/server.go +++ b/pkg/webconsole/server/server.go @@ -62,6 +62,7 @@ func (s *ConnectionServer) ServeHTTP(w http.ResponseWriter, req *http.Request) { if utils.IsInStringArray(info.Hypervisor, []string{ api.HYPERVISOR_OPENSTACK, api.HYPERVISOR_CTYUN, + api.HYPERVISOR_SANGFOR, }) { srv, err = NewWebsocketProxyServer(sessionObj) } else { diff --git a/pkg/webconsole/session/remote_console.go b/pkg/webconsole/session/remote_console.go index d7e459ded8..9735a9d0df 100644 --- a/pkg/webconsole/session/remote_console.go +++ b/pkg/webconsole/session/remote_console.go @@ -50,6 +50,7 @@ const ( CLOUDPODS = api.CLOUDPODS PROXMOX = api.PROXMOX VOLCENGINE = api.VOLC_ENGINE + SANGFOR = api.SANGFOR ) type RemoteConsoleInfo struct { @@ -128,7 +129,7 @@ func (info *RemoteConsoleInfo) GetConnectParams() (string, error) { return info.getQcloudURL() case CLOUDPODS: return info.getCloudpodsURL() - case OPENSTACK, VMRC, ZSTACK, CTYUN, HUAWEI, HCS, JDCLOUD, PROXMOX: + case OPENSTACK, VMRC, ZSTACK, CTYUN, HUAWEI, HCS, JDCLOUD, PROXMOX, SANGFOR: return info.Url, nil case VOLCENGINE: return info.getVolcEngineURL()