as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-09-29 16:04:00 +08:00
parent 170cd1455f
commit 3f03bb0e8b
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-handler/Client/Client.php
+7 -7
View File
@@ -98,16 +98,16 @@ class Client extends ClientAbstracts
*/ */
private function setParams(SwowClient $client, $path, $data): string private function setParams(SwowClient $client, $path, $data): string
{ {
$content = $this->getData()->getContents();
if (!empty($content)) {
$client->setData($content);
}
if ($this->isGet()) { if ($this->isGet()) {
if (!empty($data)) $path .= '?' . $data; if (!empty($data)) $path .= '?' . $data;
if (!empty($this->getData())) {
$client->setData($this->getData());
}
} else { } else {
if (!empty($this->getData())) { $data = $this->mergeParams($data);
$client->setData($this->getData()); if (!empty($data)) {
} else { $client->setData($data);
$client->setData($this->mergeParams($data));
} }
} }
return $path; return $path;
http-handler/Client/Curl.php
+5 -3
View File
@@ -55,12 +55,14 @@ class Curl extends ClientAbstracts
if ($isHttps !== false) { if ($isHttps !== false) {
$this->curlHandlerSslSet($resource); $this->curlHandlerSslSet($resource);
} }
if (empty($params) && empty($this->getData())) {
$contents = $this->getData()->getContents();
if (empty($params) && empty($contents)) {
return $resource; return $resource;
} }
if (!empty($this->getData())) { if (!empty($contents)) {
curl_setopt($resource, CURLOPT_POSTFIELDS, $this->getData()); curl_setopt($resource, CURLOPT_POSTFIELDS, $contents);
} else if ($method === self::POST) { } else if ($method === self::POST) {
curl_setopt($resource, CURLOPT_POSTFIELDS, $this->mergeParams($params)); curl_setopt($resource, CURLOPT_POSTFIELDS, $this->mergeParams($params));
} else if ($method === self::UPLOAD) { } else if ($method === self::UPLOAD) {