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

@@ -809,7 +809,13 @@ class ProjectUpdate extends Command
 
         $path_arr = explode('/', $path);
 
-        return end($path_arr) ? end($path_arr) : $path_arr[count($path_arr) - 2];
+        $route = end($path_arr) ? end($path_arr) : $path_arr[count($path_arr) - 2];
+
+        if (strpos($route, ',') !== false || strpos($route, '，') !== false) {
+            return '';
+        }
+
+        return $route;
     }
 
     //产品多级分类入库

@@ -422,9 +422,11 @@ class RankDataLogic extends BaseLogic
     public function save_rank($project_id, $data, int $indexed_pages_num = 0, string $lang = ''){
         $without_project_ids = [];  //不用处理排名的项目
         $without_extension_project_ids = [658]; //是否达标只统计主词的
+        $extension_project_ids = [354]; //扩展词也到达标的
 
         $first_num = $first_page_num = $first_three_pages_num = $first_five_pages_num = $first_ten_pages_num = 0;
         $first_page_without_extension_num = 0; //不算扩展词在首页的数量
+        $first_page_extension_num = 0; //扩展词在首页的数量
 
         foreach ($data as &$ranks){
             ksort($ranks);
@@ -446,6 +448,7 @@ class RankDataLogic extends BaseLogic
             if($last['position'] > 0 && $last['position'] <= 10){
                 $first_page_num ++;
                 $last['g'] == 1 && $first_page_without_extension_num++;
+                $last['g'] == 2 && $first_page_extension_num++;
             }
             //排名前三页
             if($last['position'] > 0 && $last['position'] <= 30){
@@ -480,6 +483,9 @@ class RankDataLogic extends BaseLogic
         if(in_array($project_id, $without_extension_project_ids)){
             $is_compliance = $first_page_without_extension_num >= $keyword_num;
         }
+        if(in_array($project_id, $extension_project_ids)){
+            $is_compliance = $first_page_extension_num >= $keyword_num;
+        }
         if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) {
             Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num);
             //项目表更新