as2252258/kiri-wchat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add clear

Browse Source
This commit is contained in:
as2252258@163.com
2020-01-03 11:44:31 +08:00
parent da21f45554
commit f01c5e35d8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/HttpClient.php
+2 -3
View File
@@ -463,18 +463,17 @@ class HttpClient
*/ */
private function resolve($data, $body) private function resolve($data, $body)
{ {
$type = $data['Content-Type'] ?? $data['content-type'];
if (is_array($body)) { if (is_array($body)) {
return $body; return $body;
} }
$type = $data['Content-Type'] ?? $data['content-type'];
if (strpos($type, 'json') !== false) { if (strpos($type, 'json') !== false) {
return json_decode($body, true); return json_decode($body, true);
} else if (strpos($type, 'xml') !== false || strpos($type, 'plain') !== false) { } else if (strpos($type, 'xml') !== false || strpos($type, 'plain') !== false) {
if (!is_null($newBody = json_decode($body, true))) { if (!is_null($newBody = json_decode($body, true))) {
return $newBody; return $newBody;
} }
$data = simplexml_load_string($body, 'SimpleXMLElement', LIBXML_NOCDATA); return Help::toArray($body);
return json_decode(json_encode($data), TRUE);
} else if (strpos($type, 'plain') !== false) { } else if (strpos($type, 'plain') !== false) {
return json_decode($body, TRUE); return json_decode($body, TRUE);
} else { } else {