修复get请求 传入data参数无效的BUG

Author: webguosai

README.md

@@ -10,7 +10,7 @@
  */
 class HttpClient
 {
-    private $version = '2.0.1';
+    private $version = '2.0.2';
 
     /** 请求 **/
     public $request = [
@@ -30,14 +30,14 @@ class HttpClient
     /** 配置 **/
     public $options = [
         //超时
-        'timeout'     => 3,
+        'timeout'       => 3,
 
         //代理ip池
-        'proxyIps'    => [],
+        'proxyIps'      => [],
 
         //允许重定向及重定向次数
-        'redirects'   => false,
-        'redirectMax' => 5,
+        'redirects'     => false,
+        'redirectMax'   => 5,
 
         //保存cookie的文件路径
         'cookieJarFile' => '',
@@ -182,8 +182,20 @@ public function __construct($options = [])
         $this->options = array_merge($this->options, $options);
     }
 
-    public function get($url, $data = [], $headers = [])
+    public function get($url, $data, $headers = [])
     {
+        /** 拼接url中的get参数 **/
+        if (!empty($data)) {
+            if (is_string($data)) {
+                parse_str($data,$data);
+            }
+
+            if (strpos($url, '?') === false) {
+                $url .= '?' . http_build_query($data);
+            } else {
+                $url .= '&' . http_build_query($data);
+            }
+        }
         return $this->request($url, 'GET', $data, $headers);
     }
 

example/cookie.txt

@@ -15,14 +15,8 @@
     //'cookieJarFile' => 'D:\www\test\http-client\example\cookie.txt',
 ];
 $http    = new \Webguosai\HttpClient($options);
-$response = $http->get('http://www.baidu.com');
-if ($response->ok()) {
-    dump($response->body);
-} else {
-    dump($response->getErrorMsg());
-}
-
-$url = 'http://test.com/test/http-client/example/test.php?a=1';
+
+$url = 'http://test.com/test/http-client/test/server.php?a=1';
 //$url = 'http://127.0.0.1:10453/think';
 //$url = 'http://waophp.com/api/test';
 //$url = 'https://www.qq.com/';
@@ -42,7 +36,8 @@
 //纯字符串(\n)
 $headers3 = "Accept-Language: zh-CN,zh;q=0.9\nCache-Control: max-age=0\nConnection: keep-alive";
 
-$response = $http->get($url, ['get'=>'111'], $headers);
+//$response = $http->get($url, ['get'=>'111'], $headers);
+$response = $http->get($url, 'get=111&get2=222', $headers);
 
 //$response = $http->post($url, ['post'=>'111'], $headers);
 //$response = $http->post($url, '{"post":"222"}', $headers);