Merge pull request #11530 from ioito/hotfix/qx-aliyun-vnc

fix(webconsole): aliyun vnc windows ctl+alt+del
This commit is contained in:
Zexi Li
2021-06-30 20:09:28 +08:00
committed by GitHub
2 changed files with 4 additions and 3 deletions
+1
View File
@@ -31,6 +31,7 @@ type WebConsoleOptions struct {
SshpassToolPath string `help:"sshpass tool binary path used to connect server sol" default:"/usr/bin/sshpass"`
EnableAutoLogin bool `help:"allow webconsole to log in directly with the cloudroot public key" default:"false"`
ApsaraConsoleAddr string `help:"Apsara console addr" default:"https://xxxx.com.cn/module/ecs/vnc/index.html"`
AliyunVncVersion string `help:"Aliyun vnc version" default:"0.0.8"`
}
func OnOptionsChange(oldO, newO interface{}) bool {
+3 -3
View File
@@ -159,11 +159,11 @@ func (info *RemoteConsoleInfo) getQcloudURL() (string, error) {
}
func (info *RemoteConsoleInfo) getAliyunURL() (string, error) {
isWindows := "False"
isWindows := "false"
if info.OsName == "Windows" {
isWindows = "True"
isWindows = "true"
}
base := "https://g.alicdn.com/aliyun/ecs-console-vnc2/0.0.5/index.html"
base := fmt.Sprintf("https://g.alicdn.com/aliyun/ecs-console-vnc2/%s/index.html", options.Options.AliyunVncVersion)
params := url.Values{
"vncUrl": {info.Url},
"instanceId": {info.InstanceId},