From 3c5dc19443ebe9426b6984d4676107d09691344f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=80=99=E5=AD=A6=E6=9D=B0?= Date: Wed, 23 Jan 2019 17:07:46 +0800 Subject: [PATCH 1/5] id fix --- src/Client.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Client.php b/src/Client.php index 4a9d21d..29d40d3 100644 --- a/src/Client.php +++ b/src/Client.php @@ -35,7 +35,7 @@ class Client public function __construct($config) { $this->config = $config; - $this->id = app('request')->header('X-Request-Id') ?: "no-x-request-id"; + $this->id = 1; } /** @@ -131,8 +131,7 @@ class Client */ protected function id() { -// return $this->id.'-'.time(); - return $this->id; + return $this->id++; } } \ No newline at end of file From ebb71df16f80199d28280db92671afa322875924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=80=99=E5=AD=A6=E6=9D=B0?= Date: Thu, 24 Jan 2019 11:59:46 +0800 Subject: [PATCH 2/5] add endporint --- config/rpc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/rpc.php b/config/rpc.php index 5b859c1..c7f1087 100644 --- a/config/rpc.php +++ b/config/rpc.php @@ -41,5 +41,9 @@ return [ 'local' => true, 'base_uri' => env('RPC_OP_URI','http://op.dev.haowumc.com'), ], + 'payment' => [ + 'local' => true, + 'base_uri' => env('RPC_PAYMENT_URI','http://payapi.dev.haowumc.com'), + ], ], ]; From eb05e297627cb0aeddfc260d927b3e552de3d506 Mon Sep 17 00:00:00 2001 From: dongwei <838456736@qq.com> Date: Thu, 24 Jan 2019 14:11:50 +0800 Subject: [PATCH 3/5] change log --- config/rpc.php | 2 +- src/Providers/BaseServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rpc.php b/config/rpc.php index 5b859c1..906f90a 100644 --- a/config/rpc.php +++ b/config/rpc.php @@ -35,7 +35,7 @@ return [ ], 'api' => [ 'local' => true, - 'base_uri' => env('RPC_API_URI','http://api.dev.haowumc.com'), + 'base_uri' => env('RPC_API_URI','http://sapi.dev.haowumc.com'), ], 'op' => [ 'local' => true, diff --git a/src/Providers/BaseServiceProvider.php b/src/Providers/BaseServiceProvider.php index f662a43..7a459bd 100644 --- a/src/Providers/BaseServiceProvider.php +++ b/src/Providers/BaseServiceProvider.php @@ -30,7 +30,7 @@ class BaseServiceProvider extends ServiceProvider $this->setupConfig(); $this->app->singleton("rpc.logger", function () { $config = config('rpc'); - $stream = new StreamHandler($this->app->storagePath() . $config['log_path']); + $stream = new StreamHandler($config['log_path']); $stream->setFormatter(new $config['log_formatter']()); $logger = new Logger('RPC.LOGGER'); return $logger->pushHandler($stream); From 74986304bf9207ef122a490285276182b13de4fa Mon Sep 17 00:00:00 2001 From: dongwei <838456736@qq.com> Date: Thu, 24 Jan 2019 14:25:56 +0800 Subject: [PATCH 4/5] del error doc --- src/Server/JsonRpcMethod.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Server/JsonRpcMethod.php b/src/Server/JsonRpcMethod.php index 4f280bc..a5ca9ef 100644 --- a/src/Server/JsonRpcMethod.php +++ b/src/Server/JsonRpcMethod.php @@ -25,11 +25,6 @@ class JsonRpcMethod extends JsonRpcBase ]; } - /** - * @param $code - * @param $msg - * @return array - */ public function error($code, $msg) { From b47df658829cbdf97f2127378bcbf9c3ad158277 Mon Sep 17 00:00:00 2001 From: dongwei <838456736@qq.com> Date: Thu, 24 Jan 2019 15:25:16 +0800 Subject: [PATCH 5/5] add readme's doc info --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 1af5a62..a26eb71 100644 --- a/README.md +++ b/README.md @@ -170,3 +170,19 @@ http://host/rpc/doc.html 文档地址 严格使用系统定义错误码 详见json-rpc/src/Server/JsonRpcBase.php ###更新日志 + +###文档注释格式 +``` + /** + * @title 用户登录API + * @url https://wwww.baidu.com/login + * @method POST + * @param 类型 字段名称 描述 默认 是否必须 + * @param string password 密码 空 必须 + * @code 1 成功 + * @code 2 失败 + * @return int code 状态码(具体参见状态码说明) + * @return string msg 提示信息 + */ + +```