From 366e995149c0e66e0360d229c6e66d123d516fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Wed, 26 Jun 2019 18:54:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Http.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wx/Http.php | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/wx/Http.php b/wx/Http.php
index 31bdb34..1f03217 100644
--- a/wx/Http.php
+++ b/wx/Http.php
@@ -27,12 +27,10 @@ class Http
         ) {
             return $this->curl($url, $pushType, $data, $callback, $isSSL);
         }
-        if (!extension_loaded('swoole')) {
-            return $this->curl($url, $pushType, $data, $callback, $isSSL);
-        } else {
-            $url = 'https://' . $this->url . '/' . $url;
-            return $this->coroutine($url, $pushType, $data, $callback, $isSSL);
-        }
+
+        $url = 'https://' . $this->url . '/' . $url;
+
+        return $this->curl($url, $pushType, $data, $callback, $isSSL);
     }
 
     /**
@@ -144,24 +142,23 @@ class Http
     private function build($body, $callback, $_data)
     {
         $result = [];
-        if ($callback === NULL) {
-            if (is_null($results = json_decode($body, TRUE))) {
-                $data = simplexml_load_string($body, 'SimpleXMLElement', LIBXML_NOCDATA);
-                $results = json_decode(json_encode($data), TRUE);
-            }
-            if (!is_array($results)) {
-                return new Result(['code' => 505, 'message' => '服务器返回体错误!']);
-            }
-            if (isset($results['errcode'])) {
-                $result['code'] = $results['errcode'];
-                $result['message'] = $results['errmsg'];
-            } else {
-                $result['code'] = 0;
-                $result['message'] = 'system success.';
-                $result['data'] = $results;
-            }
+        if ($callback !== NULL) {
+            return call_user_func($callback, $body, $_data);
+        }
+        if (is_null($results = json_decode($body, TRUE))) {
+            $data = simplexml_load_string($body, 'SimpleXMLElement', LIBXML_NOCDATA);
+            $results = json_decode(json_encode($data), TRUE);
+        }
+        if (!is_array($results)) {
+            return new Result(['code' => 505, 'message' => '服务器返回体错误!']);
+        }
+        if (isset($results['errcode'])) {
+            $result['code'] = $results['errcode'];
+            $result['message'] = $results['errmsg'];
         } else {
-            $result = call_user_func($callback, $body, $_data);
+            $result['code'] = 0;
+            $result['message'] = 'system success.';
+            $result['data'] = $results;
         }
         if (!is_array($result)) {
             return $result;