panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复HTTP-POST参数异常

Browse Source
This commit is contained in:
Ying
2023-07-04 18:40:50 +08:00
parent 35407bd4a3
commit 1aa5f07dbd
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extend/system/Http.php
View File

@@ -11,11 +11,11 @@ class Http
{ {
/** /**
* PC/Mobile 标识 * PC/Mobile 标识
* @var object 对象实例 * @var array 对象实例
*/ */
protected static $agent = [ protected static array $agent = [
'Opera/9.80 (Android 2.3.4; Linux; Opera Mobi/build-1107180945; U; en-GB) Presto/2.8.149 Version/11.10', 'Opera/9.80 (Android 2.3.4; Linux; Opera Mobi/build-1107180945; U; en-GB) Presto/2.8.149 Version/11.10',
'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36', 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (HTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36',
]; ];
/** /**
@@ -25,12 +25,13 @@ class Http
* @param bool $agent * @param bool $agent
* @param array $options * @param array $options
* @param array $header * @param array $header
* @param bool $headerOnly
* @return mixed|string * @return mixed|string
*/ */
public static function post(string $url, array $params = [], bool $agent = true, array $options = [], array $header = []) public static function post(string $url, array $params = [], bool $agent = true, array $options = [], array $header = [], bool $headerOnly = false)
{ {
$req = self::request($url, $params, $agent, 'POST', $options, $header); $req = self::request($url, $params, $agent, 'POST', $options, $header);
return $req['ret'] ? $req['msg'] : ''; return $headerOnly ? ($req['ret'] ? ['data' => $req['msg'], 'header' => $req['header']] : ['header' => $req['header']]) : ($req['ret'] ? $req['msg'] : '');
} }
/** /**
@@ -40,12 +41,13 @@ class Http
* @param bool $agent * @param bool $agent
* @param array $options * @param array $options
* @param array $header * @param array $header
* @param bool $headerOnly
* @return mixed|string * @return mixed|string
*/ */
public static function get(string $url, array $params = [], bool $agent = true, array $options = [], array $header = []) public static function get(string $url, array $params = [], bool $agent = true, array $options = [], array $header = [], bool $headerOnly = false)
{ {
$req = self::request($url, $params, $agent, 'GET', $options, $header); $req = self::request($url, $params, $agent, 'GET', $options, $header);
return $req['ret'] ? $req['msg'] : ''; return $headerOnly ? ($req['ret'] ? ['data' => $req['msg'], 'header' => $req['header']] : ['header' => $req['header']]) : ($req['ret'] ? $req['msg'] : '');
} }
/** /**
@@ -61,15 +63,18 @@ class Http
{ {
try { try {
$client = self::getClient($agent, $options, $header); $client = self::getClient($agent, $options, $header);
$response = $client->request($method, $url, $params ? ['query' => $params] : [])->getBody()->getContents(); $query = $method == 'GET' ? ['query' => $params] : ['form_params' => $params];
if (!empty($response)) { $response = $client->request($method, $url, $query);
return ['ret' => true, 'msg' => $response]; $content = $response->getBody()->getContents();
$header = $response->getHeaders();
if (!empty($content)) {
return ['ret' => true, 'msg' => $content, 'header' => $header];
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
return ['ret' => false, 'msg' => $e->getMessage()]; return ['ret' => false, 'msg' => $e->getMessage(), 'header' => $header];
} }
return ['ret' => false, 'msg' => $response]; return ['ret' => false, 'msg' => $content, 'header' => $header];
} }
/** /**
@@ -77,9 +82,9 @@ class Http
* @param bool $agent * @param bool $agent
* @param array $options * @param array $options
* @param array $header * @param array $header
* @return mixed * @return Client
*/ */
private static function getClient(bool $agent, array $options = [], array $header = []) private static function getClient(bool $agent, array $options = [], array $header = []): Client
{ {
if (empty($options)) { if (empty($options)) {
$options = [ $options = [
@@ -101,5 +106,4 @@ class Http
return new Client($options); return new Client($options);
} }
} }