fix return bug

pifeng · pifeng · commit b989776fc904 · 2018-05-09T16:03:18.000+08:00
diff --git a/src/Middleware/FmtApiResponse.php b/src/Middleware/FmtApiResponse.php
@@ -37,10 +37,11 @@ public function handle($request, Closure $next)
             ]);
         }
 
+        $data = json_decode($response->content(), true);
         return  $this->returnJson([
             'code'      => 0,
             'message'   => 'OK',
-            'data'      => is_null(json_decode($response->content(), true)) ?? $response->content(),
+            'data'      => is_null($data) ? $response->content()    : $data,
         ]);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,11 @@ public function handle($request, Closure $next)`
`37`	`37`	`]);`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ $data = json_decode($response->content(), true);`
`40`	`41`	`return $this->returnJson([`
`41`	`42`	`'code' => 0,`
`42`	`43`	`'message' => 'OK',`
`43`		`- 'data' => is_null(json_decode($response->content(), true)) ?? $response->content(),`
	`44`	`+ 'data' => is_null($data) ? $response->content() : $data,`
`44`	`45`	`]);`
`45`	`46`	`}`
`46`	`47`