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
2020-11-18 14:48:49 +08:00
parent 80a2116cf1
commit 4dd4044c44
1 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Client/Curl.php
+9 -32
View File
@@ -43,41 +43,21 @@ class Curl extends ClientAbstracts
$host = $isHttps ? 'https://' . $host : 'http://' . $host; $host = $isHttps ? 'https://' . $host : 'http://' . $host;
$resource = $this->do(curl_init($host . $path), $host . $path, $method); $resource = $this->do(curl_init($host . $path), $host . $path, $method);
if ($method === self::POST && !empty($params)) { if ($isHttps !== false) {
$this->curlHandlerSslSet($resource);
}
if (empty($params)) {
return $resource;
}
var_dump($params);
if ($method === self::POST) {
curl_setopt($resource, CURLOPT_POSTFIELDS, HttpParse::parse($params)); curl_setopt($resource, CURLOPT_POSTFIELDS, HttpParse::parse($params));
} else if ($method === self::UPLOAD) { } else if ($method === self::UPLOAD) {
curl_setopt($resource, CURLOPT_POSTFIELDS, $params); curl_setopt($resource, CURLOPT_POSTFIELDS, $params);
} }
if ($isHttps !== false) {
return $this->curlHandlerSslSet($resource);
}
return $resource; return $resource;
} }
//
// /**
// * @param $path
// * @param $params
// * @return mixed|resource
// * @throws Exception
// */
// public function upload($path, $params = [])
// {
// [$host, $isHttps, $path] = $this->matchHost($path);
//
// $host = $isHttps ? 'https://' . $host : 'http://' . $host;
//
// $resource = $this->do(curl_init($host . $path), $host . $path, self::POST);
//
// curl_setopt($resource, CURLOPT_POSTFIELDS, $params);
//
// if ($isHttps !== false) {
// return $this->execute($this->curlHandlerSslSet($resource));
// }
// return $this->execute($resource);
// }
/** /**
* @param $resource * @param $resource
@@ -111,6 +91,7 @@ class Curl extends ClientAbstracts
*/ */
private function do($resource, $path, $method) private function do($resource, $path, $method)
{ {
curl_setopt($resource, CURLOPT_URL, $path);
curl_setopt($resource, CURLOPT_TIMEOUT, $this->getTimeout()); // 超时设置 curl_setopt($resource, CURLOPT_TIMEOUT, $this->getTimeout()); // 超时设置
curl_setopt($resource, CURLOPT_CONNECTTIMEOUT, $this->getConnectTimeout()); // 超时设置 curl_setopt($resource, CURLOPT_CONNECTTIMEOUT, $this->getConnectTimeout()); // 超时设置
@@ -133,9 +114,6 @@ class Curl extends ClientAbstracts
if ($method === self::POST || $method == self::UPLOAD) { if ($method === self::POST || $method == self::UPLOAD) {
curl_setopt($resource, CURLOPT_POST, 1); curl_setopt($resource, CURLOPT_POST, 1);
} }
var_dump($path);
curl_setopt($resource, CURLOPT_URL, $path);
curl_setopt($resource, CURLOPT_CUSTOMREQUEST, $method); curl_setopt($resource, CURLOPT_CUSTOMREQUEST, $method);
return $resource; return $resource;
@@ -150,7 +128,6 @@ class Curl extends ClientAbstracts
private function execute($curl) private function execute($curl)
{ {
$output = curl_exec($curl); $output = curl_exec($curl);
var_dump($output);
if ($output === false) { if ($output === false) {
return $this->fail(400, curl_error($curl)); return $this->fail(400, curl_error($curl));
} }