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

@@ -538,6 +538,15 @@ class UpdateSeoTdk extends Command
                 return $str;
                 return $str;
             $keyword = array_slice($fix_keyword, 0, $num);
             $keyword = array_slice($fix_keyword, 0, $num);
             $str = implode(", ", $keyword);
             $str = implode(", ", $keyword);
+
+            // 前后缀内部去重
+            foreach ($keyword as $k=>$v){
+                $tmp = rtrim($v, 's');
+                if (substr_count($str, $tmp) > 1) {
+                    unset($keyword[$k]);
+                    $str = implode(", ", $keyword);
+                }
+            }
         }
         }
         return $str;
         return $str;
     }
     }

@@ -1104,6 +1104,14 @@ function getPrefixKeyword($project_id, $type, $num)
             return $str;
             return $str;
         $keyword = array_slice($fix_keyword, 0, $num);
         $keyword = array_slice($fix_keyword, 0, $num);
         $str = implode(", ", $keyword);
         $str = implode(", ", $keyword);
+
+        foreach ($keyword as $k=>$v){
+            $tmp = rtrim($v, 's');
+            if (substr_count($str, $tmp) > 1) {
+                unset($keyword[$k]);
+                $str = implode(", ", $keyword);
+            }
+        }
     }
     }
     return $str;
     return $str;
 }
 }

@@ -488,6 +488,7 @@ class RankDataLogic extends BaseLogic
         $without_project_ids = [];  //不用处理排名的项目
         $without_project_ids = [];  //不用处理排名的项目
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $extension_project_ids = [354]; //扩展词也到达标的
         $extension_project_ids = [354]; //扩展词也到达标的
+        $compliance_project_ids = [2163]; //直接达标处理的
         $ceaseProjectId = [
         $ceaseProjectId = [
             47,
             47,
             354,
             354,
@@ -575,6 +576,9 @@ class RankDataLogic extends BaseLogic
         if(in_array($project_id, $extension_project_ids)){
         if(in_array($project_id, $extension_project_ids)){
             $is_compliance = $first_page_extension_num >= $keyword_num;
             $is_compliance = $first_page_extension_num >= $keyword_num;
         }
         }
+        if(in_array($project_id, $compliance_project_ids)){
+            $is_compliance = 1; //直接达标处理
+        }
         if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) {
         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);
             Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num);
             //项目表更新
             //项目表更新