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

fix: 修复HTTP一处获取参数bug

Browse Source
This commit is contained in:
Ying
2023-07-11 10:50:22 +08:00
parent 550403b9ab
commit c0bc6c25e7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/BaseController.php
View File

@@ -314,7 +314,7 @@ class BaseController
*/ */
public function export(): Response public function export(): Response
{ {
// if (\request()->isAjax()) { if (\request()->isAjax()) {
// 获取分页 // 获取分页
$page = input('page', 1); $page = input('page', 1);
@@ -338,9 +338,9 @@ class BaseController
$downUrl = str_replace(public_path(), '', $filePath); $downUrl = str_replace(public_path(), '', $filePath);
return $this->success('导出成功！', $downUrl); return $this->success('导出成功！', $downUrl);
// } }
// return $this->error('非法请求！'); return $this->error('非法请求！');
} }
/** /**

8
extend/system/Http.php
View File

@@ -63,7 +63,13 @@ class Http
{ {
try { try {
$client = self::getClient($agent, $options, $header); $client = self::getClient($agent, $options, $header);
$query = $method == 'GET' ? ['query' => $params] : ['form_params' => $params]; $query = [];
if ($method == 'GET') {
$query_string = http_build_query($params);
$url = $query_string ? $url . (stripos($url, "?") !== false ? "&" : "?") . $query_string : $url;
} else {
$query['form_params'] = $params;
}
$response = $client->request($method, $url, $query); $response = $client->request($method, $url, $query);
$content = $response->getBody()->getContents(); $content = $response->getBody()->getContents();
$header = $response->getHeaders(); $header = $response->getHeaders();