opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11828 from ioito/hotfix/qx-jdcloud-webconsole

Browse Source 
fix(webconsole): add jdcloud vnc
This commit is contained in:
Zexi Li
2021-08-06 00:40:26 +08:00
committed by GitHub
parent f481850c6a c1be18524c
commit b02a25da64
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/webconsole/consts.go
+1
View File
@@ -31,4 +31,5 @@ const (
CTYUN = "ctyun"
HUAWEI = "huawei"
APSARA = "apsara"
JDCLOUD = "jdcloud"
)
pkg/webconsole/handlers.go
+1 -1
View File
@@ -210,7 +210,7 @@ func handleServerRemoteConsole(ctx context.Context, w http.ResponseWriter, r *ht
return
}
switch info.Protocol {
case session.ALIYUN, session.QCLOUD, session.OPENSTACK, session.VMRC, session.ZSTACK, session.CTYUN, session.HUAWEI, session.APSARA:
case session.ALIYUN, session.QCLOUD, session.OPENSTACK, session.VMRC, session.ZSTACK, session.CTYUN, session.HUAWEI, session.APSARA, session.JDCLOUD:
responsePublicCloudConsole(ctx, info, w)
case session.VNC, session.SPICE, session.WMKS:
handleDataSession(ctx, info, w, url.Values{"password": {info.GetPassword()}}, true)
pkg/webconsole/session/remote_console.go
+2 -1
View File
@@ -37,6 +37,7 @@ const (
CTYUN = api.CTYUN
HUAWEI = api.HUAWEI
APSARA = api.APSARA
JDCLOUD = api.JDCLOUD
)
type RemoteConsoleInfo struct {
@@ -126,7 +127,7 @@ func (info *RemoteConsoleInfo) GetConnectParams() (string, error) {
return info.getApsaraURL()
case QCLOUD:
return info.getQcloudURL()
case OPENSTACK, VMRC, ZSTACK, CTYUN, HUAWEI:
case OPENSTACK, VMRC, ZSTACK, CTYUN, HUAWEI, JDCLOUD:
return info.Url, nil
default:
return "", fmt.Errorf("Can't convert protocol %s to connect params", info.Protocol)