Skip to content

Commit 022420d

Browse files
author
jiannei
committed
fix: UploadedFile 序列化错误
1 parent 83d6f1f commit 022420d

File tree

3 files changed

+27
-23
lines changed

3 files changed

+27
-23
lines changed

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ LOG_CHANNEL=mongo
7777
LOG_SLACK_WEBHOOK_URL=
7878
LOG_QUERY=true
7979
LOG_REQUEST=true
80-
LOG_MONGODB_SEPARATE=daily
81-
LOG_MONGODB_LEVEL=debug
8280

8381
# 如果使用的是 mongo channel 需要配置
84-
MONGODB_HOST=mongo
85-
MONGODB_PORT=27017
86-
MONGODB_DATABASE=lumen-api
87-
MONGODB_USERNAME=
88-
MONGODB_PASSWORD=
89-
MONGODB_AUTHENTICATION_DATABASE=admin
82+
LOG_MONGODB_SEPARATE=daily
83+
LOG_MONGODB_LEVEL=debug
84+
LOG_MONGODB_HOST=127.0.0.1
85+
LOG_MONGODB_PORT=27017
86+
LOG_MONGODB_DATABASE=logs
87+
LOG_MONGODB_USERNAME=
88+
LOG_MONGODB_PASSWORD=
89+
LOG_MONGODB_AUTHENTICATION_DATABASE=admin
9090
```
9191

9292
### 其他
@@ -115,7 +115,7 @@ logger_async(LogEnum::SYSTEM_SQL, $arrayData);
115115
[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"}
116116
```
117117

118-
- 记录日志到 Mongodb 的日志内容
118+
- 记录到 Mongodb 的日志内容
119119

120120
```
121121
/* 1 */
@@ -167,7 +167,7 @@ logger_async(LogEnum::SYSTEM_SQL, $arrayData);
167167

168168
## 特别说明
169169

170-
- SQL 日志记录参考:l[aravel-query-logger](https://github.com/overtrue/laravel-query-logger)
170+
- SQL 日志记录参考:[laravel-query-logger](https://github.com/overtrue/laravel-query-logger)
171171

172172
## License
173173

src/Listeners/RequestHandledListener.php

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,22 @@ class RequestHandledListener
1919
{
2020
public function handle(RequestHandledEvent $event)
2121
{
22-
$request = $event->request;
23-
$response = $event->response;
24-
25-
$start = $request->server('REQUEST_TIME_FLOAT');
22+
$start = $event->request->server('REQUEST_TIME_FLOAT');
2623
$end = microtime(true);
24+
25+
$request = $event->request->all();
26+
if ($files = $event->request->allFiles()) {
27+
foreach ($files as $key => $uploadedFile) {
28+
$request[$key] = [
29+
'originalName' => $uploadedFile->getClientOriginalName(),
30+
'mimeType' => $uploadedFile->getClientMimeType(),
31+
];
32+
}
33+
}
34+
2735
$context = [
28-
'request' => $request->all(),
29-
'response' => $response instanceof SymfonyResponse ? json_decode($response->getContent(), true) : (string) $response,
36+
'request' => $request,
37+
'response' => $event->response instanceof SymfonyResponse ? json_decode($event->response->getContent(), true) : (string) $event->response,
3038
'start' => $start,
3139
'end' => $end,
3240
'duration' => formatDuration($end - $start),

src/MongoLogger.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,11 @@ public function __invoke(array $config)
4343
$collection = 'logs';
4444
}
4545

46-
$handler = new MongoDBHandler( // 创建 Handler
47-
new Client($uri), // 创建 MongoDB 客户端(依赖 mongodb/mongodb)
48-
$config['database'],
49-
$collection
50-
);
46+
$handler = new MongoDBHandler(new Client($uri), $config['database'], $collection);
5147
$handler->setLevel($config['level']);
5248

53-
$logger = new Logger($config['channel']); // 创建 Logger
54-
$logger->pushHandler($handler); // 挂载 Handler
49+
$logger = new Logger($config['channel']);
50+
$logger->pushHandler($handler);
5551

5652
return $logger;
5753
}

0 commit comments

Comments
 (0)