周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 6f485abfe4510836fbd4f6bcb639ddb459d045bc 1 个父辈 92674e7a

rank_data

内嵌 并排对比
正在显示 3 个修改的文件 包含 13 行增加 和 8 行删除
@@ -60,7 +60,7 @@ class IndexedPages extends BaseCommands @@ -60,7 +60,7 @@ class IndexedPages extends BaseCommands
60 //有排名api编号的项目 60 //有排名api编号的项目
61 $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray(); 61 $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray();
62 Log::channel('rank_data')->info('开始-页面收录数据-'.count($list)); 62 Log::channel('rank_data')->info('开始-页面收录数据-'.count($list));
63 - $list[] = [2104 => 11201]; 63 + $list[2104] = 11201;
64 foreach ($list as $project_id => $api_no) { 64 foreach ($list as $project_id => $api_no) {
65 Log::channel('rank_data')->info('开始-页面收录数据-' . $project_id . '->' .$api_no); 65 Log::channel('rank_data')->info('开始-页面收录数据-' . $project_id . '->' .$api_no);
66 $rankDataLogic = new RankDataLogic(); 66 $rankDataLogic = new RankDataLogic();
@@ -37,7 +37,7 @@ class RankWeek extends BaseCommands @@ -37,7 +37,7 @@ class RankWeek extends BaseCommands
37 //有排名api编号的项目 37 //有排名api编号的项目
38 $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray(); 38 $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray();
39 //特殊处理 39 //特殊处理
40 - $list[] = [2104 => 11201]; 40 + $list[2104] = 11201;
41 LogUtils::info('start rank_data_week:' . count($list)); 41 LogUtils::info('start rank_data_week:' . count($list));
42 foreach ($list as $project_id => $api_no) { 42 foreach ($list as $project_id => $api_no) {
43 $rankDataLogic = new RankDataLogic(); 43 $rankDataLogic = new RankDataLogic();
@@ -197,7 +197,12 @@ class RankDataLogic extends BaseLogic @@ -197,7 +197,12 @@ class RankDataLogic extends BaseLogic
197 $lang = $this->request['lang'] ?: ''; 197 $lang = $this->request['lang'] ?: '';
198 $project_id = $this->user['project_id']; 198 $project_id = $this->user['project_id'];
199 $project = (new ProjectLogic())->getProjectInfo($project_id); 199 $project = (new ProjectLogic())->getProjectInfo($project_id);
200 - $api_no = $project['deploy_optimize']['api_no'] ?? ''; 200 + if(request('api_no')){
  201 + $api_no = request('api_no');
  202 + }else{
  203 + $api_no = $project['deploy_optimize']['api_no'] ?? 0;
  204 + }
  205 +
201 $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ''); 206 $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
202 $domain_arr = parse_url($domain); 207 $domain_arr = parse_url($domain);
203 $domain = $domain_arr['host'] ?? $domain_arr['path']; 208 $domain = $domain_arr['host'] ?? $domain_arr['path'];
@@ -209,7 +214,7 @@ class RankDataLogic extends BaseLogic @@ -209,7 +214,7 @@ class RankDataLogic extends BaseLogic
209 $ai_projects = $this->getAiProjects()['data'] ?? []; 214 $ai_projects = $this->getAiProjects()['data'] ?? [];
210 $flg_ai = $this->getAiFlag($ai_projects, $domain); 215 $flg_ai = $this->getAiFlag($ai_projects, $domain);
211 $ai_domain = str_replace('www.', '', $this->getAiProjects($domain)['domain'] ?? ''); 216 $ai_domain = str_replace('www.', '', $this->getAiProjects($domain)['domain'] ?? '');
212 - $list = RankData::where('project_id', $project_id)->where('lang', $lang)->value('data') ?: []; 217 + $list = RankData::where('project_id', $project_id)->where('api_no', $api_no)->where('lang', $lang)->value('data') ?: [];
213 $list30 = []; //排名前三十的 218 $list30 = []; //排名前三十的
214 $list30_0 = []; //排名前三十且近三天没有排名的 219 $list30_0 = []; //排名前三十且近三天没有排名的
215 $list100 = []; //排名前100的 220 $list100 = []; //排名前100的
@@ -635,7 +640,7 @@ class RankDataLogic extends BaseLogic @@ -635,7 +640,7 @@ class RankDataLogic extends BaseLogic
635 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('domain', 'project_id'); 640 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('domain', 'project_id');
636 //特殊处理 641 //特殊处理
637 if($api_no == 11201){ 642 if($api_no == 11201){
638 - $project_ids[] = [2104 => 'www.xabcbiology.ru']; 643 + $project_ids[2104] = 'www.xabcbiology.ru';
639 } 644 }
640 foreach ($project_ids as $project_id => $domain) { 645 foreach ($project_ids as $project_id => $domain) {
641 if (!$domain) { 646 if (!$domain) {
@@ -727,7 +732,7 @@ class RankDataLogic extends BaseLogic @@ -727,7 +732,7 @@ class RankDataLogic extends BaseLogic
727 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('domain', 'project_id'); 732 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('domain', 'project_id');
728 //特殊处理 733 //特殊处理
729 if($api_no == 11201){ 734 if($api_no == 11201){
730 - $project_ids[] = [2104 => 'www.xabcbiology.ru']; 735 + $project_ids[2104] = 'www.xabcbiology.ru';
731 } 736 }
732 foreach ($project_ids as $project_id => $domain) { 737 foreach ($project_ids as $project_id => $domain) {
733 if (!$domain) { 738 if (!$domain) {
@@ -782,7 +787,7 @@ class RankDataLogic extends BaseLogic @@ -782,7 +787,7 @@ class RankDataLogic extends BaseLogic
782 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('domain', 'project_id'); 787 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('domain', 'project_id');
783 //特殊处理 788 //特殊处理
784 if($api_no == 11201){ 789 if($api_no == 11201){
785 - $project_ids[] = [2104 => 'www.xabcbiology.ru']; 790 + $project_ids[2104] = 'www.xabcbiology.ru';
786 } 791 }
787 foreach ($project_ids as $project_id => $domain) { 792 foreach ($project_ids as $project_id => $domain) {
788 $model = IndexedPagesModel::where('project_id', $project_id)->where('api_no', $api_no)->first(); 793 $model = IndexedPagesModel::where('project_id', $project_id)->where('api_no', $api_no)->first();
@@ -850,7 +855,7 @@ class RankDataLogic extends BaseLogic @@ -850,7 +855,7 @@ class RankDataLogic extends BaseLogic
850 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('domain', 'project_id'); 855 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('domain', 'project_id');
851 //特殊处理 856 //特殊处理
852 if($api_no == 11201){ 857 if($api_no == 11201){
853 - $project_ids[] = [2104 => 'www.xabcbiology.ru']; 858 + $project_ids[2104] = 'www.xabcbiology.ru';
854 } 859 }
855 foreach ($project_ids as $project_id => $domain) { 860 foreach ($project_ids as $project_id => $domain) {
856 $rank_week = RankWeekModel::where('project_id', $project_id)->where('api_no', $api_no)->first(); 861 $rank_week = RankWeekModel::where('project_id', $project_id)->where('api_no', $api_no)->first();