0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化 http 客户端

Browse Source
This commit is contained in:
JaguarJack 2020-05-22 18:24:10 +08:00
parent 30e7829d21
commit 167ea743a0
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
extend/catcher/library/client/Http.php
View File

@ -217,9 +217,8 @@ class Http
*/
public function get(string $url)
{
return new Response($this->getClient()->{$this->asyncMethod(__FUNCTION__)}($url, array_merge($this->header, $this->query, $this->timeout, $this->options)));
return new Response($this->getClient()->{$this->asyncMethod(__FUNCTION__)}($url, $this->merge()));
}
/**
* Request post
*
@ -229,9 +228,7 @@ class Http
*/
public function post(string $url)
{
return new Response($this->getClient()->{$this->asyncMethod(__FUNCTION__)}($url, array_merge(
$this->header, $this->body, $this->formParams, $this->json, $this->timeout, $this->multipart,$this->options
)));
return new Response($this->getClient()->{$this->asyncMethod(__FUNCTION__)}($url, $this->merge()));
}
/**
@ -243,9 +240,7 @@ class Http
*/
public function put(string $url)
{
return new Response($this->getClient()->{$this->asyncMethod(__FUNCTION__)}($url, array_merge(
$this->header, $this->body, $this->formParams, $this->json, $this->timeout, $this->options
)));
return new Response($this->getClient()->{$this->asyncMethod(__FUNCTION__)}($url, $this->merge()));
}
/**
@ -257,9 +252,21 @@ class Http
*/
public function delete(string $url)
{
return new Response($this->getClient()->{$this->asyncMethod(__FUNCTION__)}($url, array_merge(
$this->header, $this->query, $this->timeout, $this->options
)));
return new Response($this->getClient()->{$this->asyncMethod(__FUNCTION__)}($url, $this->merge()));
}
/**
* request params merge
*
* @time 2020年05月22日
* @return array
*/
protected function merge()
{
return array_merge($this->header, $this->query, $this->timeout,
$this->options, $this->body, $this->auth, $this->multipart, $this->formParams
);
}
/**

13
extend/catcher/library/client/Response.php
View File

@ -34,6 +34,17 @@ class Response implements \ArrayAccess
return $this->response->getBody();
}
/**
* 响应内容
*
* @time 2020年05月22日
* @return false|string
*/
public function contents()
{
return $this->body()->getContents();
}
/**
*
* @time 2020年05月21日
@ -41,7 +52,7 @@ class Response implements \ArrayAccess
*/
public function json():array
{
return \json_decode($this->response->getBody()->getContents(), true);
return \json_decode($this->contents(), true);
}
/**