From 022420df90ea0c07884ab3f923419bf09695e195 Mon Sep 17 00:00:00 2001 From: jiannei Date: Fri, 12 Mar 2021 11:33:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20UploadedFile=20=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 20 ++++++++++---------- src/Listeners/RequestHandledListener.php | 20 ++++++++++++++------ src/MongoLogger.php | 10 +++------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 6a98a2b..ad6ea07 100644 --- a/README.md +++ b/README.md @@ -77,16 +77,16 @@ LOG_CHANNEL=mongo LOG_SLACK_WEBHOOK_URL= LOG_QUERY=true LOG_REQUEST=true -LOG_MONGODB_SEPARATE=daily -LOG_MONGODB_LEVEL=debug # 如果使用的是 mongo channel 需要配置 -MONGODB_HOST=mongo -MONGODB_PORT=27017 -MONGODB_DATABASE=lumen-api -MONGODB_USERNAME= -MONGODB_PASSWORD= -MONGODB_AUTHENTICATION_DATABASE=admin +LOG_MONGODB_SEPARATE=daily +LOG_MONGODB_LEVEL=debug +LOG_MONGODB_HOST=127.0.0.1 +LOG_MONGODB_PORT=27017 +LOG_MONGODB_DATABASE=logs +LOG_MONGODB_USERNAME= +LOG_MONGODB_PASSWORD= +LOG_MONGODB_AUTHENTICATION_DATABASE=admin ``` ### 其他 @@ -115,7 +115,7 @@ logger_async(LogEnum::SYSTEM_SQL, $arrayData); [2021-01-18 12:03:36] local.DEBUG: System request {"request":[],"response":{"status":"success","code":200,"message":"操作成功","data":{"data":[{"id":1,"nickname":"Evert Stracke DVM","email":"aufderhar.kaden@example.net"},{"id":2,"nickname":"Milton Toy","email":"keagan.eichmann@example.org"},{"id":3,"nickname":"Mrs. Alyce O'Hara","email":"cartwright.sidney@example.org"},{"id":4,"nickname":"Prof. Evalyn Windler I","email":"bertram.bartoletti@example.org"},{"id":5,"nickname":"Brant Skiles","email":"jane16@example.net"},{"id":6,"nickname":"Sage Rodriguez I","email":"ryder50@example.org"},{"id":7,"nickname":"Ms. Angelica Wiegand DVM","email":"kaelyn.mueller@example.net"},{"id":8,"nickname":"Newton Zieme","email":"sipes.kip@example.com"},{"id":9,"nickname":"Natalia Ruecker","email":"stroman.kiley@example.com"},{"id":10,"nickname":"Hallie Parisian","email":"rosina74@example.net"},{"id":11,"nickname":"Jiannei","email":"longjian.huang@foxmail.com"}],"meta":{"pagination":{"total":11,"count":11,"per_page":15,"current_page":1,"total_pages":1,"links":[]}}},"error":[]},"start":1610942614.450748,"end":1610942615.785696,"duration":"1.33s"} {"url":"/users","ip":"172.22.0.1","http_method":"GET","server":"lumen-api.test","referrer":null,"unique_id":"43f54ea9-4ad4-47cf-b9da-1d3aa150ff61"} ``` -- 记录日志到 Mongodb 的日志内容 +- 记录到 Mongodb 的日志内容 ``` /* 1 */ @@ -167,7 +167,7 @@ logger_async(LogEnum::SYSTEM_SQL, $arrayData); ## 特别说明 -- SQL 日志记录参考：l[aravel-query-logger](https://github.com/overtrue/laravel-query-logger) +- SQL 日志记录参考：[laravel-query-logger](https://github.com/overtrue/laravel-query-logger) ## License diff --git a/src/Listeners/RequestHandledListener.php b/src/Listeners/RequestHandledListener.php index 2d93bbe..321ca1c 100644 --- a/src/Listeners/RequestHandledListener.php +++ b/src/Listeners/RequestHandledListener.php @@ -19,14 +19,22 @@ class RequestHandledListener { public function handle(RequestHandledEvent $event) { - $request = $event->request; - $response = $event->response; - - $start = $request->server('REQUEST_TIME_FLOAT'); + $start = $event->request->server('REQUEST_TIME_FLOAT'); $end = microtime(true); + + $request = $event->request->all(); + if ($files = $event->request->allFiles()) { + foreach ($files as $key => $uploadedFile) { + $request[$key] = [ + 'originalName' => $uploadedFile->getClientOriginalName(), + 'mimeType' => $uploadedFile->getClientMimeType(), + ]; + } + } + $context = [ - 'request' => $request->all(), - 'response' => $response instanceof SymfonyResponse ? json_decode($response->getContent(), true) : (string) $response, + 'request' => $request, + 'response' => $event->response instanceof SymfonyResponse ? json_decode($event->response->getContent(), true) : (string) $event->response, 'start' => $start, 'end' => $end, 'duration' => formatDuration($end - $start), diff --git a/src/MongoLogger.php b/src/MongoLogger.php index 5dd2f06..ed1fb0e 100644 --- a/src/MongoLogger.php +++ b/src/MongoLogger.php @@ -43,15 +43,11 @@ public function __invoke(array $config) $collection = 'logs'; } - $handler = new MongoDBHandler( // 创建 Handler - new Client($uri), // 创建 MongoDB 客户端（依赖 mongodb/mongodb） - $config['database'], - $collection - ); + $handler = new MongoDBHandler(new Client($uri), $config['database'], $collection); $handler->setLevel($config['level']); - $logger = new Logger($config['channel']); // 创建 Logger - $logger->pushHandler($handler); // 挂载 Handler + $logger = new Logger($config['channel']); + $logger->pushHandler($handler); return $logger; }