Merge branch 'feature/tunnel'

src/Middleware/TunnelMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace JsonRpc\Middleware;
 
 use Closure;
@@ -37,23 +38,23 @@ class TunnelMiddleware
 	public function terminate($request, $response)
 	{
 		//过滤tool返回结果
-        if ($response instanceof JsonResponse)
-        {
+		if ($response instanceof JsonResponse) {
+			if (app()->environment('dev', 'production')) {
 				$content = $response->getOriginalContent();
 				$status = isset($content['error']) ? $content['error']['code'] : 200;
-
-            $client = new \InfluxDB\Client('http://localhost', '8086');
+				$client = new \InfluxDB\Client("10.0.1.67");
 				$database = $client->selectDB('rpc_monitor');
 				$points = array(
 					new Point(
 						'monitor',
-                    0.64,
-                    ['app' =>env('APP_NAME'), 'status' => $status],
+						null,
+						['app' => env('APP_NAME'), 'status' => $status, 'env' => app()->environment()],
 						['content' => $request->getContent()]
 					)
 				);
-            $result = $database->writePoints($points, Database::PRECISION_SECONDS);
-            app('rpc.logger')->info('rpc tunnel ctx ' [$result]);
+				$database->writePoints($points, Database::PRECISION_SECONDS);
+			}
+			
 		}
 	}
 	

src/Server/JsonRpcMethod.php

@@ -29,11 +29,21 @@ class JsonRpcMethod extends JsonRpc
     public function error($code, $msg)
     {
 
-        return [
+        return is_string($msg)
+            ? [
                 'jsonrpc' => '2.0',
                 'error' => [
                     'code' => $code,
-                'message' => is_array($msg) ? json_encode($msg) : $msg,
+                    'message' => $msg,
+                ],
+                'id' => $this->id
+            ]
+            : [
+                'jsonrpc' => '2.0',
+                'error' => [
+                    'code' => $code,
+                    'message' => self::ErrorMsg[$code],
+                    'data' => $msg
                 ],
                 'id' => $this->id
             ];