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

Lyh server



查看合并请求 !3300

@@ -232,21 +232,19 @@ class IndexController extends BaseController
     public function prInfoDownload()
     public function prInfoDownload()
     {
     {
         $url = 'http://crawl.scraper.waimaoq.com/export/issuewire';
         $url = 'http://crawl.scraper.waimaoq.com/export/issuewire';
-        $response = Http::withHeaders([
-            'Accept' => 'application/json',
-        ])->get($url, [
+        $param = [
             'page' => $this->page,
             'page' => $this->page,
             'pagesize' => $this->row,
             'pagesize' => $this->row,
-            'token' => 'MT0CM7y4tdFTFTm'
-        ]);
+            'token' => 'MT0CM7y4tdFTFTm',
+            'pr_id' => $this->param['pr_id'],
+            'release_time_start'=>$this->param['release_time_start'],
+            'release_time_end'=>$this->param['release_time_end'],
+        ];
+        $param = array_filter($param);
+        $response = Http::withHeaders(['Accept' => 'application/json',])->get($url, $param);
         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
-            ]);
+            $this->response('success', Code::SUCCESS, ['url' => $url, 'list' => $result, 'page' => $this->page, 'pagesize' => $this->row]);
         } else {
         } else {
             $this->response('请求失败', Code::SYSTEM_ERROR, ['status_code' => $response->status(), 'error' => $response->body()]);
             $this->response('请求失败', Code::SYSTEM_ERROR, ['status_code' => $response->status(), 'error' => $response->body()]);
         }
         }

@@ -92,11 +92,14 @@ class GeoArticleLogic extends BaseLogic
             if(!empty($this->param['data'])){
             if(!empty($this->param['data'])){
                 $data = [];
                 $data = [];
                 foreach ($this->param['data'] as $item){
                 foreach ($this->param['data'] as $item){
-                   $data[] = [
-                       'filename' => $item['filename'],
-                       'url'=> $item['url'],
-                       'project_id'=>$this->param['project_id']
-                   ];
+                   $info = $this->model->read(['url'=>$item['url'],'filename'=>$item['filename']]);
+                   if($info === false){
+                       $data[] = [
+                           'filename' => $item['filename'],
+                           'url'=> $item['url'],
+                           'project_id'=>$this->param['project_id']
+                       ];
+                   }
                 }
                 }
                 $this->model->insertAll($data);
                 $this->model->insertAll($data);
             }
             }