This commit is contained in:
2021-05-06 15:14:13 +08:00
parent 96b8a35e2b
commit b517e7e6a2
3 changed files with 35 additions and 16 deletions
+26 -13
View File
@@ -71,6 +71,7 @@ class Client extends ClientAbstracts
} }
} }
/** /**
* @param $data * @param $data
* @param $host * @param $host
@@ -85,29 +86,41 @@ class Client extends ClientAbstracts
} else { } else {
$client = new SClient($host, $this->getPort(), false); $client = new SClient($host, $this->getPort(), false);
} }
if (strpos($path, '/') !== 0) {
$path = '/' . $path;
}
$client->set($this->settings()); $client->set($this->settings());
if (!empty($this->getAgent())) { if (!empty($this->getAgent())) {
$this->addHeader('User-Agent', $this->getAgent()); $this->addHeader('User-Agent', $this->getAgent());
} }
$client->setHeaders($this->getHeader()); $client->setHeaders($this->getHeader());
$client->setMethod(strtoupper($this->getMethod())); $client->setMethod(strtoupper($this->getMethod()));
if ($this->isGet() && !empty($data)) { $client->execute($this->setParams($client, $path, $data));
$path .= '?' . $data;
} else {
$this->setData($this->mergeParams($data));
}
if (!empty($this->getData())) {
$client->setData($this->getData());
}
$client->execute($path);
$client->close(); $client->close();
return $client; return $client;
} }
/**
* @param $client
* @param $path
* @param $data
* @return string
*/
private function setParams(SClient $client, $path, $data): string
{
if ($this->isGet()) {
if (!empty($data)) $path .= '?' . $data;
if (!empty($this->getData())) {
$client->setData($this->getData());
}
} else {
if (!empty($this->getData())) {
$client->setData($this->getData());
} else {
$client->setData($this->mergeParams($data));
}
}
return $path;
}
/** /**
* @return array * @return array
*/ */
+9
View File
@@ -676,6 +676,15 @@ abstract class ClientAbstracts extends Component implements IClient
return strtolower($this->method) === self::POST; return strtolower($this->method) === self::POST;
} }
/**
* @return bool
* check isPost Request
*/
#[Pure] public function isUpload(): bool
{
return strtolower($this->method) === self::UPLOAD;
}
/** /**
* @return bool * @return bool
-3
View File
@@ -21,9 +21,6 @@ class Event extends BaseObject
private static array $_events = []; private static array $_events = [];
const EVENT_ERROR = 'WORKER:ERROR';
const EVENT_STOP = 'WORKER:STOP';
const EVENT_EXIT = 'WORKER:EXIT';
const PIPE_MESSAGE = 'SERVER:PIPE:MESSAGE'; const PIPE_MESSAGE = 'SERVER:PIPE:MESSAGE';
const TASK_FINISH = 'SERVER:TASK::FINISH'; const TASK_FINISH = 'SERVER:TASK::FINISH';