合并分支 'lyh-server' 到 'master'
变更数据 查看合并请求 !3302
正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
| @@ -234,7 +234,7 @@ class IndexController extends BaseController | @@ -234,7 +234,7 @@ class IndexController extends BaseController | ||
| 234 | $url = 'http://crawl.scraper.waimaoq.com/export/issuewire'; | 234 | $url = 'http://crawl.scraper.waimaoq.com/export/issuewire'; |
| 235 | $param = [ | 235 | $param = [ |
| 236 | 'page' => $this->page, | 236 | 'page' => $this->page, |
| 237 | - 'pagesize' => $this->row, | 237 | + 'page_size' => $this->row, |
| 238 | 'token' => 'MT0CM7y4tdFTFTm', | 238 | 'token' => 'MT0CM7y4tdFTFTm', |
| 239 | 'pr_id' => $this->param['pr_id'] ?? '', | 239 | 'pr_id' => $this->param['pr_id'] ?? '', |
| 240 | 'release_time_start'=>$this->param['release_time_start'] ?? '', | 240 | 'release_time_start'=>$this->param['release_time_start'] ?? '', |
| @@ -244,7 +244,7 @@ class IndexController extends BaseController | @@ -244,7 +244,7 @@ class IndexController extends BaseController | ||
| 244 | $response = Http::withHeaders(['Accept' => 'application/json',])->get($url, $param); | 244 | $response = Http::withHeaders(['Accept' => 'application/json',])->get($url, $param); |
| 245 | if ($response->successful()) { | 245 | if ($response->successful()) { |
| 246 | $result = $response->json(); | 246 | $result = $response->json(); |
| 247 | - $this->response('success', Code::SUCCESS, ['url' => $url, 'list' => $result, 'page' => $this->page, 'pagesize' => $this->row]); | 247 | + $this->response('success', Code::SUCCESS, ['url' => $url, 'list' => $result, 'page' => $this->page, 'page_size' => $this->row]); |
| 248 | } else { | 248 | } else { |
| 249 | $this->response('请求失败', Code::SYSTEM_ERROR, ['status_code' => $response->status(), 'error' => $response->body()]); | 249 | $this->response('请求失败', Code::SYSTEM_ERROR, ['status_code' => $response->status(), 'error' => $response->body()]); |
| 250 | } | 250 | } |
-
请 注册 或 登录 后发表评论