diff --git a/app/BaseController.php b/app/BaseController.php index 5db0b4e..1b83083 100644 --- a/app/BaseController.php +++ b/app/BaseController.php @@ -314,7 +314,7 @@ class BaseController */ public function export(): Response { -// if (\request()->isAjax()) { + if (\request()->isAjax()) { // 获取分页 $page = input('page', 1); @@ -338,9 +338,9 @@ class BaseController $downUrl = str_replace(public_path(), '', $filePath); return $this->success('导出成功!', $downUrl); -// } + } -// return $this->error('非法请求!'); + return $this->error('非法请求!'); } /** diff --git a/extend/system/Http.php b/extend/system/Http.php index 1f6b6aa..f3b9ea5 100644 --- a/extend/system/Http.php +++ b/extend/system/Http.php @@ -63,7 +63,13 @@ class Http { try { $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); $content = $response->getBody()->getContents(); $header = $response->getHeaders();