diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index ededdb960a..74e06c5ad5 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -98,5 +98,5 @@ $lang->zanode->init->serviceStatus = [ ]; $lang->zanode->init->title = "初始化执行节点"; $lang->zanode->init->descTitle = "请根据引导完成执行节点上的初始化: "; -$lang->zanode->init->initDesc = "1. 在执行节点上执行:bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -s vm -k "; +$lang->zanode->init->initDesc = "1. 在执行节点上执行:bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -s zvm -k "; $lang->zanode->init->statusTitle = "Service Status"; \ No newline at end of file diff --git a/module/zanode/model.php b/module/zanode/model.php index d7b22cd0d8..3f919c5416 100644 --- a/module/zanode/model.php +++ b/module/zanode/model.php @@ -607,16 +607,18 @@ class zanodemodel extends model public function getServiceStatus($node) { $result = json_decode(commonModel::http("http://{$node->ip}:{$node->zap}/api/v1/service/check", json_encode(array("services" => "all")), array(), array("Authorization:$node->tokenSN"))); - if(empty($result->data) || $result->code != 'success') + if(empty($result->data->ztfStatus) || $result->code != 'success') { $result = new stdclass; $result->data = $this->lang->zanode->init->serviceStatus; + }else{ + $result->data = array( + "ZenAgent" => "ready", + "ZTF" => $result->data->ztfStatus, + ); } - return array( - "ZenAgent" => "ready", - "ZTF" => $result->data->ztfStatus, - ); + return $result->data; } /** diff --git a/module/zanode/view/init.html.php b/module/zanode/view/init.html.php index d46257298a..1dfb6a4229 100644 --- a/module/zanode/view/init.html.php +++ b/module/zanode/view/init.html.php @@ -36,7 +36,6 @@