update

@@ -43,43 +43,50 @@ class RankData extends BaseCommands
      */
      */
     public function do()
     public function do()
     {
     {
-        Log::channel('rank_data')->info('开始-排名数据');
-        //同步api_no
         try {
         try {
-            $this->SyncApiNo();
-        }catch (\Exception $e){
-            Log::channel('rank_data')->error('同步api_no失败：' . $e->getMessage());
-        }
-
 
 
-        //所有项目 今日是否达标 重置
-        //有失败会重跑任务，导致达标又被重置 加缓存一天只重置一次
-        if(!Cache::get('clear_remain_today_'.date('Y-m-d'))){
-            Project::where('is_remain_today', 1)->update(['is_remain_today' => 0]);
-            Cache::set('clear_remain_today_'.date('Y-m-d'), 1, 24 * 3600);
-        }
 
 
-        $error = 0;
-        $api = new QuanqiusouApi();
-        //有排名api编号的项目
-        $list = DeployOptimize::where('api_no', '>' , 0)->select('api_no','minor_languages','project_id')->get();
-        Log::channel('rank_data')->info('开始-排名数据-'.count($list));
-        //当日所有站点谷歌收录数据
-        $site_res = $api->getSiteRes();
-        if(!$site_res){
-            return false;
-        }
-        foreach ($list as $item){
-            echo $item['api_no'] . PHP_EOL;
+            Log::channel('rank_data')->info('开始-排名数据');
+            //同步api_no
             try {
             try {
-                (new RankDataLogic())->syncRankData($item['api_no'], $site_res);
-            }catch (\Exception $e){
-                Log::channel('rank_data')->error('RankData：失败 ' . $item['api_no'] . $e->getMessage());
-                $error++;
-                continue;
+                $this->SyncApiNo();
+            } catch (\Exception $e) {
+                Log::channel('rank_data')->error('同步api_no失败：' . $e->getMessage());
             }
             }
+
+
+            //所有项目 今日是否达标 重置
+            //有失败会重跑任务，导致达标又被重置 加缓存一天只重置一次
+            if (!Cache::get('clear_remain_today_' . date('Y-m-d'))) {
+                Project::where('is_remain_today', 1)->update(['is_remain_today' => 0]);
+                Cache::set('clear_remain_today_' . date('Y-m-d'), 1, 24 * 3600);
+            }
+
+            $error = 0;
+            $api = new QuanqiusouApi();
+            //有排名api编号的项目
+            $list = DeployOptimize::where('api_no', '>', 0)->select('api_no', 'minor_languages', 'project_id')->get();
+            Log::channel('rank_data')->info('开始-排名数据-' . count($list));
+            //当日所有站点谷歌收录数据
+            $site_res = $api->getSiteRes();
+            if (!$site_res) {
+                return false;
+            }
+            foreach ($list as $item) {
+                echo $item['api_no'] . PHP_EOL;
+                try {
+                    (new RankDataLogic())->syncRankData($item['api_no'], $site_res);
+                } catch (\Exception $e) {
+                    Log::channel('rank_data')->error('RankData：失败 ' . $item['api_no'] . $e->getMessage());
+                    $error++;
+                    continue;
+                }
+            }
+            return !$error;
+        } catch (\Exception $e) {
+            Log::channel('rank_data')->error('排名数据任务失败 ' . $e->getMessage());
+            throw new \Exception($e->getMessage());
         }
         }
-        return !$error;
     }
     }
 
 
     /**
     /**
@@ -98,16 +105,17 @@ class RankData extends BaseCommands
 
 
         $api = new QuanqiusouApi();
         $api = new QuanqiusouApi();
         $ai_nos = $api->getWebApiNo();
         $ai_nos = $api->getWebApiNo();
-
-        foreach ($deploy_optimizes as $deploy_optimize){
-            $domain = DomainInfo::where('id', $deploy_optimize['domain'])->value('domain');
-            if(!$domain){
-                continue;
-            }
-            $api_no = array_search($domain, $ai_nos);
-            if($api_no){
-                $deploy_optimize->api_no = $api_no;
-                $deploy_optimize->save();
+        if($ai_nos){
+            foreach ($deploy_optimizes as $deploy_optimize){
+                $domain = DomainInfo::where('id', $deploy_optimize['domain'])->value('domain');
+                if(!$domain){
+                    continue;
+                }
+                $api_no = array_search($domain, $ai_nos);
+                if($api_no){
+                    $deploy_optimize->api_no = $api_no;
+                    $deploy_optimize->save();
+                }
             }
             }
         }
         }
     }
     }