Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'zenops_46' into zenops_46_zhaoke_77683

Browse Source
This commit is contained in:
zhaoke
2022-12-01 07:38:58 +00:00
parent 12721262a6 661f8f3258
commit a201d42fa5
474 changed files with 11001 additions and 3129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zanode/model.php
+3 -3
View File
@@ -24,7 +24,7 @@ class zanodemodel extends model
const STATUS_DESTROY_FAIL = 'vim_destroy_fail';
const KVM_CREATE_PATH = '/api/v1/kvm/create';
const KVM_TOKEN_PATH = '/api/v1/vnc/getToken';
const KVM_TOKEN_PATH = '/api/v1/virtual/getVncToken';
/**
@@ -433,8 +433,8 @@ class zanodemodel extends model
$host = $this->getHostByID($vm->parent);
if(empty($host)) return false;
$agnetUrl = 'http://' . $host->extranet . ':' . $host->agentPort . static::KVM_TOKEN_PATH;
$result = json_decode(commonModel::http("$agnetUrl?port={$vm->vnc}", null, array(), array("Authorization:$host->tokenSN")));
$agnetUrl = 'http://' . $host->extranet . ':8086' . static::KVM_TOKEN_PATH;
$result = json_decode(commonModel::http("$agnetUrl?port={$vm->vnc}", array(), array(CURLOPT_CUSTOMREQUEST => 'GET'), array("Authorization:$host->tokenSN"), 'json'));
if(empty($result) or $result->code != 'success') return false;