* Refactor zanodeModel::getServiceStatus.

module/zanode/control.php

@@ -508,7 +508,7 @@ class zanode extends control
     public function ajaxGetServiceStatus(int $hostID)
     {
         $node          = $this->zanode->getNodeById($hostID);
-        $serviceStatus = $this->zanode->getServiceStatus($node);
+        $serviceStatus = $this->zanodeZen->getServiceStatus($node);
         if($node->status != 'running')
         {
             $serviceStatus['ZenAgent'] = 'unknown';

module/zanode/model.php

@@ -662,34 +662,6 @@ class zanodemodel extends model
         return $returnData;
     }
 
-    /**
-     * 获取宿主机中zagent、nginx、websockify、novnc的运行及安装状态.
-     * Get service status from host.
-     *
-     * @param  object $node
-     * @access public
-     * @return array
-     */
-    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"), 'data', 'POST', 10));
-
-        if(empty($result->data->ztfStatus) || $result->code != 'success')
-        {
-            $result = new stdclass;
-            $result->data = $this->lang->zanode->init->serviceStatus;
-
-            return $result->data;
-        }
-
-        $result->data = array(
-            'ZenAgent' => 'ready',
-            'ZTF'      => $result->data->ztfStatus,
-        );
-
-        return $result->data;
-    }
-
     /**
      * 执行节点安装应用（支持ztf,zendata）.
      * Install service to node by name.

module/zanode/zen.php

@@ -149,4 +149,22 @@ class zanodeZen extends zanode
         }
         return $result;
     }
+
+    /**
+     * 获取宿主机中zagent、nginx、websockify、novnc的运行及安装状态.
+     * Get service status from host.
+     *
+     * @param  object $node
+     * @access public
+     * @return array
+     */
+    public function getServiceStatus(object $node): array
+    {
+        $result = json_decode(commonModel::http("http://{$node->ip}:{$node->zap}/api/v1/service/check", json_encode(array('services' => 'all')), array(), array("Authorization:$node->tokenSN"), 'data', 'POST', 10));
+
+        if(empty($result->data->ztfStatus) || $result->code != 'success') return $this->lang->zanode->init->serviceStatus;
+
+        $statusData = array('ZenAgent' => 'ready', 'ZTF' => $result->data->ztfStatus);
+        return $statusData;
+    }
 }