Merge pull request #145 from nly/master

* 解决 ?avinfo= 的问题，理论上 ?a=&b= 和 ?a&b 是一样的，但是七牛并不兼容 ?avinfo= 的格式

Author: xudianyang

src/Client/Http/Client.php

@@ -322,7 +322,17 @@ public function goGet($url = '', $query = null, $timeout = 30000, $headers = [])
         }
         $this->setHeaders($headers);
 
-        $sendGetReq  = $this->getObject(Http::class, [$this, 'GET', $this->urlData['path'], $query, $timeout]);
+        //支持直接在url之后带参数形式的GET请求
+        $q = '';
+        if (!empty($this->urlData['query'])) {
+            $q = ltrim($this->urlData['query'], '?');
+        }
+
+        if (!empty($query)) {
+            $q .= empty($q) ? '' : '&' . http_build_query($query) ;
+        }
+
+        $sendGetReq  = $this->getObject(Http::class, [$this, 'GET', $this->urlData['path'], $q, $timeout]);
 
         return $sendGetReq;
     }
@@ -427,12 +437,16 @@ public function goSingleGet($url = '', $query = [], $timeout = 30000, $headers =
         $this->setHeaders($headers);
 
         //支持直接在url之后带参数形式的GET请求
+        $q = '';
         if (!empty($this->urlData['query'])) {
-            parse_str(trim($this->urlData['query'], '?'), $data);
-            $query = array_merge($data, $query);
+            $q = ltrim($this->urlData['query'], '?');
+        }
+
+        if (!empty($query)) {
+            $q .= empty($q) ? '' : '&' . http_build_query($query) ;
         }
 
-        return yield $this->getObject(Http::class, [$this, 'GET', $this->urlData['path'], $query, $timeout]);
+        return yield $this->getObject(Http::class, [$this, 'GET', $this->urlData['path'], $q, $timeout]);
     }
 
     /**
@@ -668,13 +682,13 @@ public static function parseUrl($url)
      * 发起异步GET请求
      *
      * @param string $path 待请求的URL Path
-     * @param array $query 查询参数
+     * @param string $query 查询参数
      * @param $callback
      */
-    public function get($path, $query, $callback)
+    public function get($path, string $query, $callback)
     {
         if (!empty($query)) {
-            $path = $path . "?" . http_build_query($query);
+            $path = $path . '?' . $query;
         }
         $this->client->get($path, $callback);
     }