更新 Http.php

This commit is contained in:
2019-06-26 18:54:48 +08:00
committed by Gitee
parent 58b185bbb7
commit 366e995149
+20 -23
View File
@@ -27,12 +27,10 @@ class Http
) { ) {
return $this->curl($url, $pushType, $data, $callback, $isSSL); return $this->curl($url, $pushType, $data, $callback, $isSSL);
} }
if (!extension_loaded('swoole')) {
return $this->curl($url, $pushType, $data, $callback, $isSSL); $url = 'https://' . $this->url . '/' . $url;
} else {
$url = 'https://' . $this->url . '/' . $url; return $this->curl($url, $pushType, $data, $callback, $isSSL);
return $this->coroutine($url, $pushType, $data, $callback, $isSSL);
}
} }
/** /**
@@ -144,24 +142,23 @@ class Http
private function build($body, $callback, $_data) private function build($body, $callback, $_data)
{ {
$result = []; $result = [];
if ($callback === NULL) { if ($callback !== NULL) {
if (is_null($results = json_decode($body, TRUE))) { return call_user_func($callback, $body, $_data);
$data = simplexml_load_string($body, 'SimpleXMLElement', LIBXML_NOCDATA); }
$results = json_decode(json_encode($data), TRUE); if (is_null($results = json_decode($body, TRUE))) {
} $data = simplexml_load_string($body, 'SimpleXMLElement', LIBXML_NOCDATA);
if (!is_array($results)) { $results = json_decode(json_encode($data), TRUE);
return new Result(['code' => 505, 'message' => '服务器返回体错误!']); }
} if (!is_array($results)) {
if (isset($results['errcode'])) { return new Result(['code' => 505, 'message' => '服务器返回体错误!']);
$result['code'] = $results['errcode']; }
$result['message'] = $results['errmsg']; if (isset($results['errcode'])) {
} else { $result['code'] = $results['errcode'];
$result['code'] = 0; $result['message'] = $results['errmsg'];
$result['message'] = 'system success.';
$result['data'] = $results;
}
} else { } else {
$result = call_user_func($callback, $body, $_data); $result['code'] = 0;
$result['message'] = 'system success.';
$result['data'] = $results;
} }
if (!is_array($result)) { if (!is_array($result)) {
return $result; return $result;