Skip to content

Commit

Permalink
fix: UploadedFile 序列化错误
Browse files Browse the repository at this point in the history
  • Loading branch information
jiannei committed Mar 12, 2021
1 parent 83d6f1f commit 022420d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 23 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

### 其他
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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

Expand Down
20 changes: 14 additions & 6 deletions src/Listeners/RequestHandledListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
10 changes: 3 additions & 7 deletions src/MongoLogger.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 022420d

Please sign in to comment.