周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 5167f1cd7ddc5e29e81eb274df2458fcbece1617 2 个父辈 21bfe83e 4b634b10

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 13 行增加 和 1 行删除
@@ -809,7 +809,13 @@ class ProjectUpdate extends Command @@ -809,7 +809,13 @@ class ProjectUpdate extends Command
809 809
810 $path_arr = explode('/', $path); 810 $path_arr = explode('/', $path);
811 811
812 - return end($path_arr) ? end($path_arr) : $path_arr[count($path_arr) - 2]; 812 + $route = end($path_arr) ? end($path_arr) : $path_arr[count($path_arr) - 2];
  813 +
  814 + if (strpos($route, ',') !== false || strpos($route, '，') !== false) {
  815 + return '';
  816 + }
  817 +
  818 + return $route;
813 } 819 }
814 820
815 //产品多级分类入库 821 //产品多级分类入库
@@ -422,9 +422,11 @@ class RankDataLogic extends BaseLogic @@ -422,9 +422,11 @@ class RankDataLogic extends BaseLogic
422 public function save_rank($project_id, $data, int $indexed_pages_num = 0, string $lang = ''){ 422 public function save_rank($project_id, $data, int $indexed_pages_num = 0, string $lang = ''){
423 $without_project_ids = []; //不用处理排名的项目 423 $without_project_ids = []; //不用处理排名的项目
424 $without_extension_project_ids = [658]; //是否达标只统计主词的 424 $without_extension_project_ids = [658]; //是否达标只统计主词的
  425 + $extension_project_ids = [354]; //扩展词也到达标的
425 426
426 $first_num = $first_page_num = $first_three_pages_num = $first_five_pages_num = $first_ten_pages_num = 0; 427 $first_num = $first_page_num = $first_three_pages_num = $first_five_pages_num = $first_ten_pages_num = 0;
427 $first_page_without_extension_num = 0; //不算扩展词在首页的数量 428 $first_page_without_extension_num = 0; //不算扩展词在首页的数量
  429 + $first_page_extension_num = 0; //扩展词在首页的数量
428 430
429 foreach ($data as &$ranks){ 431 foreach ($data as &$ranks){
430 ksort($ranks); 432 ksort($ranks);
@@ -446,6 +448,7 @@ class RankDataLogic extends BaseLogic @@ -446,6 +448,7 @@ class RankDataLogic extends BaseLogic
446 if($last['position'] > 0 && $last['position'] <= 10){ 448 if($last['position'] > 0 && $last['position'] <= 10){
447 $first_page_num ++; 449 $first_page_num ++;
448 $last['g'] == 1 && $first_page_without_extension_num++; 450 $last['g'] == 1 && $first_page_without_extension_num++;
  451 + $last['g'] == 2 && $first_page_extension_num++;
449 } 452 }
450 //排名前三页 453 //排名前三页
451 if($last['position'] > 0 && $last['position'] <= 30){ 454 if($last['position'] > 0 && $last['position'] <= 30){
@@ -480,6 +483,9 @@ class RankDataLogic extends BaseLogic @@ -480,6 +483,9 @@ class RankDataLogic extends BaseLogic
480 if(in_array($project_id, $without_extension_project_ids)){ 483 if(in_array($project_id, $without_extension_project_ids)){
481 $is_compliance = $first_page_without_extension_num >= $keyword_num; 484 $is_compliance = $first_page_without_extension_num >= $keyword_num;
482 } 485 }
  486 + if(in_array($project_id, $extension_project_ids)){
  487 + $is_compliance = $first_page_extension_num >= $keyword_num;
  488 + }
483 if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) { 489 if ($keyword_num && $type == Project::TYPE_TWO && $is_compliance) {
484 Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num); 490 Log::channel('rank_data')->info('项目' . $project_id . ':关键词达标'. $keyword_num .' - ' . $first_page_num . ' - ' . $first_page_without_extension_num);
485 //项目表更新 491 //项目表更新