ComposerUpdate

vendor/composer/installed.json

@@ -401,12 +401,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "802a2cf0211c40702665f7d068fd8a830abc67f5"
+            "reference": "80a2dd413f62f0915afbb7be7ac43b8c8bd742d3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/802a2cf0211c40702665f7d068fd8a830abc67f5",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/80a2dd413f62f0915afbb7be7ac43b8c8bd742d3",
-            "reference": "802a2cf0211c40702665f7d068fd8a830abc67f5",
+            "reference": "80a2dd413f62f0915afbb7be7ac43b8c8bd742d3",
             "shasum": "",
             "mirrors": [
                 {
@@ -426,7 +426,7 @@
             "qiniu/php-sdk": "^7.2",
             "topthink/framework": "5.1.*"
         },
-        "time": "2019-12-17T07:42:02+00:00",
+        "time": "2019-12-17T10:41:31+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

vendor/zoujingli/think-library/src/service/JsonRpcClientService.php

@@ -21,7 +21,7 @@ use library\tools\Data;
 /**
  * JsonRpc 客户端服务
  * Class JsonRpcClientService
- * @package think\admin\service
+ * @package library\service
  */
 class JsonRpcClientService extends Service
 {
@@ -44,35 +44,28 @@ class JsonRpcClientService extends Service
      */
     public function create($proxy)
     {
-        $this->proxy = $proxy;
         $this->requestid = Data::randomCode(16, 3);
+        $this->proxy = $proxy;
         return $this;
     }
 
     /**
-     * 执行 JsonRCP 请求
+     * 执行 JsonRpc 请求
      * @param string $method
      * @param array $params
-     * @return array|boolean
+     * @return mixed
      * @throws \think\Exception
      */
     public function __call($method, $params)
     {
-        // check
+        // Performs the HTTP POST
-        if (!is_scalar($method)) {
-            throw new \think\Exception('Method name has no scalar value');
-        }
-        // check
-        if (is_array($params)) {
-            $params = array_values($params);
-        } else {
-            throw new \think\Exception('Params must be given as array');
-        }
-        // performs the HTTP POST
         $options = [
             'http' => [
-                'method'  => 'POST', 'header' => 'Content-type: application/json',
+                'method'  => 'POST',
-                'content' => json_encode(['method' => $method, 'params' => $params, 'id' => $this->requestid], JSON_UNESCAPED_UNICODE),
+                'header'  => 'Content-type: application/json',
+                'content' => json_encode([
+                    'jsonrpc' => '2.0', 'method' => $method, 'params' => $params, 'id' => $this->requestid,
+                ], JSON_UNESCAPED_UNICODE),
             ],
         ];
         if ($fp = fopen($this->proxy, 'r', false, stream_context_create($options))) {
@@ -81,16 +74,16 @@ class JsonRpcClientService extends Service
             fclose($fp);
             $response = json_decode($response, true);
         } else {
-            throw new \think\Exception("Unable to connect to {$this->proxy}");
+            throw new \think\Exception("无法连接到 {$this->proxy}");
         }
-        // final checks and return
+        // Final checks and return
         if ($response['id'] != $this->requestid) {
-            throw new \think\Exception("Incorrect response id (request id: {$this->requestid}, response id: {$response['id']}）");
+            throw new \think\Exception("错误的响应标记 (请求标记: {$this->requestid}, 响应标记: {$response['id']}）");
         }
         if (is_null($response['error'])) {
             return $response['result'];
         } else {
-            throw new \think\Exception("Request error: {$response['error']}");
+            throw new \think\Exception("请求错误：[{$response['error']['code']}] {$response['error']['message']}");
         }
     }
 }

vendor/zoujingli/think-library/src/service/JsonRpcServerService.php

@@ -21,14 +21,13 @@ use think\exception\HttpResponseException;
 /**
  * JsonRpc 服务端服务
  * Class JsonRpcServerService
- * @package think\admin\service
+ * @package library\service
  */
 class JsonRpcServerService extends Service
 {
     /**
      * 设置监听对象
      * @param mixed $object
-     * @throws \think\Exception
      */
     public function handle($object)
     {
@@ -41,18 +40,23 @@ class JsonRpcServerService extends Service
         } else {
             // Reads the input data
             $request = json_decode(file_get_contents('php://input'), true);
-            if (empty($request['id'])) {
+            if (empty($request)) {
-                throw new \think\Exception('JsonRpc Request id cannot be empty');
+                $error = ['code' => '-32700', 'message' => '语法解析错误', 'meaning' => '服务端接收到无效的JSON'];
-            }
+                $response = ['jsonrpc' => '2.0', 'id' => $request['id'], 'result' => null, 'error' => $error];
-            // Executes the task on local object
+            } elseif (!isset($request['id']) || !isset($request['method']) || !isset($request['params'])) {
-            try {
+                $error = ['code' => '-32600', 'message' => '无效的请求', 'meaning' => '发送的JSON不是一个有效的请求对象'];
+                $response = ['jsonrpc' => '2.0', 'id' => $request['id'], 'result' => null, 'error' => $error];
+            } else try {
+                // Executes the task on local object
                 if ($result = @call_user_func_array([$object, $request['method']], $request['params'])) {
-                    $response = ['id' => $request['id'], 'result' => $result, 'error' => null];
+                    $response = ['jsonrpc' => '2.0', 'id' => $request['id'], 'result' => $result, 'error' => null];
                 } else {
-                    $response = ['id' => $request['id'], 'result' => null, 'error' => 'unknown method or incorrect parameters'];
+                    $error = ['code' => '-32601', 'message' => '找不到方法', 'meaning' => '该方法不存在或无效'];
+                    $response = ['jsonrpc' => '2.0', 'id' => $request['id'], 'result' => null, 'error' => $error];
                 }
             } catch (\Exception $e) {
-                $response = ['id' => $request['id'], 'result' => null, 'error' => $e->getMessage()];
+                $error = ['code' => $e->getCode(), 'message' => $e->getMessage()];
+                $response = ['jsonrpc' => '2.0', 'id' => $request['id'], 'result' => null, 'error' => $error];
             }
             // Output the response
             throw new HttpResponseException(json($response)->contentType('text/javascript'));