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

gx



查看合并请求 !1624

@@ -37,8 +37,13 @@ class GoogleSearchController extends BaseController
         if($searchInfo === false){
         if($searchInfo === false){
             //获取当前项目域名
             //获取当前项目域名
             $domain = parse_url($this->user['domain'], PHP_URL_HOST);
             $domain = parse_url($this->user['domain'], PHP_URL_HOST);
-            $data = NoticeLog::createLog(NoticeLog::GOOGLE_SEARCH, ['project_id' => $this->user['project_id'],'domain'=>$domain,'type'=>$this->param['type']]);
-            $this->response('数据更新时间为7天，新数据生成中,请2小时后查看...',Code::SUCCESS,$data);
+            $noticeModel = new NoticeLog();
+            $info = $noticeModel->read(['project_id' => $this->user['project_id'],'domain'=>$domain,'type'=>$this->param['type'],'status'=>NoticeLog::STATUS_PENDING]);
+            if($info === false){
+                $noticeModel->addReturnId(['data'=>json_encode(['project_id' => $this->user['project_id'],'domain'=>$domain,'type'=>$this->param['type']],true
+                ),'type'=>$noticeModel::GOOGLE_SEARCH]);
+            }
+            $this->response('数据更新时间为7天，新数据生成中...',Code::SUCCESS);
         }
         }
         //查询详情数据
         //查询详情数据
         $searchDetailModel = new GoogleSearchDetail();
         $searchDetailModel = new GoogleSearchDetail();