出错时返回false

Author: zng

Seefan/Service/Kv.php

@@ -8,71 +8,44 @@ public function __construct($base_url, $http)
         $this->name = 'kv';
     }
 
-    /**
-     * 删除指定键值
-     *
-     * @param string $key 键
-     *
-     * @return bool 是否删除成功
-     */
+    public function get($key)
+    {
+        $url = $this->name . '/' . $key;
+        $resp = $this->http->request($this->base_url . $url);
+        return $this->response($resp);
+    }
+
     public function delete($key)
     {
         $url = $this->name . '/' . $key;
         $resp = $this->http->request($this->base_url . $url, '', 'DELETE');
         return $resp == 'true';
     }
 
-    /**
-     * 设置键值
-     *
-     * @param string $key 键
-     * @param string $value 值
-     *
-     * @return bool 是否设置成功
-     */
     public function set($key, $value)
     {
         $url = $this->name . '/' . $key;
         $resp = $this->http->request($this->base_url . $url, $value, 'PUT');
         return $resp == 'true';
     }
 
-    /**
-     * 获取指定键的值
-     *
-     * @param string $key 键
-     *
-     * @return string 值
-     */
-    public function get($key)
-    {
-        $url = $this->name . '/' . $key;
-        $resp = $this->http->request($this->base_url . $url);
-        return $this->response($resp);
-    }
-
-    /**
-     * 返回指定键下的键名列表，如果指定键下还有子级的话
-     *
-     * @param string $key
-     *
-     * @return mixed|string
-     */
     public function keys($key = '')
     {
         $url = $this->name . '/' . $key . '?keys';
         $resp = $this->http->request($this->base_url . $url);
         return parent::response($resp);
     }
 
-    protected function response($str)
+    public function response($str)
     {
-        if (!empty($str)) {
-            $json = json_decode($str, true);
+        $json = parent::response($str);
+        if (is_array($json)) {
             if (count($json) > 0) {
                 return base64_decode($json[0]['Value']);
             }
+        } else {
+            return $json;
         }
-        return '';
+        return false;
     }
 }

Seefan/Service/Service.php

@@ -1,5 +1,6 @@
 <?php
 namespace Seefan\Service;
+
 use Seefan\Http;
 
 class Service
@@ -11,8 +12,11 @@ class Service
     protected $base_url = '';
     public $name = 'agent';
 
-    protected function response($str)
+    public function response($str)
     {
+        if ($str === false) {
+            return false;
+        }
         if (empty($str)) {
             return '';
         }