合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3299

@@ -231,11 +231,24 @@ class IndexController extends BaseController
      */
      */
     public function prInfoDownload()
     public function prInfoDownload()
     {
     {
-        $url = 'http://crawl.scraper.waimaoq.com/export/issuewire?token=MT0CM7y4tdFTFTm';
-        $response = Http::get($url,['page'=>$this->page,'pagesize'=>$this->row]);
+        $url = 'http://crawl.scraper.waimaoq.com/export/issuewire';
+        $response = Http::withHeaders([
+            'Accept' => 'application/json',
+        ])->get($url, [
+            'page' => $this->page,
+            'pagesize' => $this->row,
+            'token' => 'MT0CM7y4tdFTFTm'
+        ]);
         if ($response->successful()) {
         if ($response->successful()) {
             $result = $response->json();
             $result = $response->json();
+            $this->response('success', Code::SUCCESS, [
+                'url' => $url,
+                'list' => $result,
+                'page' => $this->page,
+                'pagesize' => $this->row
+            ]);
+        } else {
+            $this->response('请求失败', Code::SYSTEM_ERROR, ['status_code' => $response->status(), 'error' => $response->body()]);
         }
         }
-        $this->response('success', Code::SUCCESS, ['url'=>$url,'list'=>$result ?? []]);
     }
     }
 }
 }