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:36:39 +08:00
parent 9934adad01
commit 145e680740
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/HttpClient.php
+1 -8
View File
@@ -465,18 +465,11 @@ class HttpClient
private function resolve($data, $body) private function resolve($data, $body)
{ {
$type = $data['Content-Type'] ?? $data['content-type']; $type = $data['Content-Type'] ?? $data['content-type'];
if (is_array($body)) {
return $body;
}
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) { } else if (strpos($type, 'xml') !== false) {
$data = simplexml_load_string($body, 'SimpleXMLElement', LIBXML_NOCDATA); $data = simplexml_load_string($body, 'SimpleXMLElement', LIBXML_NOCDATA);
$encode = json_encode($data); return json_decode(json_encode($data), TRUE);
if (is_array($encode)) {
return $encode;
}
return json_decode($encode, 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 {