Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -45,7 +45,12 @@ class RankData extends BaseCommands
     {
     {
         Log::channel('rank_data')->info('开始-排名数据');
         Log::channel('rank_data')->info('开始-排名数据');
         //同步api_no
         //同步api_no
+        try {
             $this->SyncApiNo();
             $this->SyncApiNo();
+        }catch (\Exception $e){
+            Log::channel('rank_data')->error('同步api_no失败：' . $e->getMessage());
+        }
+
 
 
         //所有项目 今日是否达标 重置
         //所有项目 今日是否达标 重置
         //有失败会重跑任务，导致达标又被重置 加缓存一天只重置一次
         //有失败会重跑任务，导致达标又被重置 加缓存一天只重置一次

@@ -312,7 +312,7 @@ class WebTraffic extends Command
         $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
         $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
         $data = [];
         $data = [];
         foreach ($list as $project) {
         foreach ($list as $project) {
-            $lang = WebLanguage::getLangById($this->project['main_lang_id']??1)['short'];
+            $lang = WebLanguage::getLangById($project['main_lang_id']??1)['short'];
             if(empty($project->domainInfo['domain'])){
             if(empty($project->domainInfo['domain'])){
                 continue;
                 continue;
             }
             }

@@ -802,14 +802,15 @@ class ProjectController extends BaseController
         ];
         ];
         foreach ($data as $k => $v){
         foreach ($data as $k => $v){
             if(isset($item[$k])){
             if(isset($item[$k])){
-                $item[$k] = Arr::s2a($item[$k]);
-                $item[$k] = $v.'总条数：'.$item[$k]['total_page'].
-                    ', title更新数：'.$item[$k]['title'].
-                    ',keyword更新数据：'.$item[$k]['keyword'].
-                    ',des更新数据：'.$item[$k]['des'];
+                $data = Arr::s2a($item[$k]);
+                //{"des": 3500, "title": 0, "keyword": 3501, "total_page": 8458, "keyword_title": 3500, "keyword_content": 3500}
+                $item[$k] = $v.'总条数：'.$data['total_page'].
+                    ', title更新数：'.$data['title'].
+                    ',keyword更新数：'.$data['keyword'].
+                    ',des更新数：'.$data['des'];
                 if($k == 'gl_product_keyword'){
                 if($k == 'gl_product_keyword'){
-                    $item[$k] .= ',keyword_title更新数据：'.($item[$k]['keyword_title']??0);
-                    $item[$k] .= ',keyword_content更新数据：'.($item[$k]['keyword_content']??0);
+                    $item[$k] .= ',keyword_title更新数：'.($data['keyword_title']??0);
+                    $item[$k] .= ',keyword_content更新数：'.($data['keyword_content']??0);
                 }
                 }
             }
             }