opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1296 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webconsole-opt to release/2.6.0

Browse Source 
* commit '5e2760ef13e12f222459ae808048de36f6bad120':
  webconsole: append protocol params for each connParams
This commit is contained in:
邱剑
2019-03-22 15:47:54 +08:00
parent 36603a6aaa 5e2760ef13
commit 818f9870e6
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/webconsole.go
-1
View File
@@ -25,7 +25,6 @@ func init() {
if err != nil {
return err
}
u.Path = "index.html"
u.RawQuery = connParams
fmt.Println(u.String())
return nil
pkg/webconsole/session/remote_console.go
+13 -5
View File
@@ -104,11 +104,21 @@ func (info *RemoteConsoleInfo) GetPassword() string {
}
func (info *RemoteConsoleInfo) getOpenStackURL() (string, error) {
return info.Url, nil
return info.getConnParamsURL(info.Url, nil), nil
}
func (info *RemoteConsoleInfo) getConnParamsURL(baseURL string, params url.Values) string {
if params == nil {
params = url.Values{}
}
params.Set("protocol", info.Protocol)
queryURL := params.Encode()
return fmt.Sprintf("%s?%s", baseURL, queryURL)
}
func (info *RemoteConsoleInfo) getQcloudURL() (string, error) {
return "https://img.qcloud.com/qcloud/app/active_vnc/index.html?InstanceVncUrl=" + info.Url, nil
base := "https://img.qcloud.com/qcloud/app/active_vnc/index.html?InstanceVncUrl=" + info.Url
return info.getConnParamsURL(base, nil), nil
}
func (info *RemoteConsoleInfo) getAliyunURL() (string, error) {
@@ -122,8 +132,6 @@ func (info *RemoteConsoleInfo) getAliyunURL() (string, error) {
"instanceId": {info.InstanceId},
"isWindows": {isWindows},
"password": {info.Password},
"protocol": {info.Protocol},
}
queryURL := params.Encode()
return fmt.Sprintf("%s?%s", base, queryURL), nil
return info.getConnParamsURL(base, params), nil
}