作者 lyh

gx

@@ -28,10 +28,10 @@ class Kernel extends ConsoleKernel @@ -28,10 +28,10 @@ class Kernel extends ConsoleKernel
28 $schedule->command('web_traffic 2')->cron('*/18 * * * *'); // 引流 4-8个月的项目,18分钟一次 28 $schedule->command('web_traffic 2')->cron('*/18 * * * *'); // 引流 4-8个月的项目,18分钟一次
29 $schedule->command('web_traffic 3')->cron('*/12 * * * *'); // 引流 大于9个月的项目,12分钟一次 29 $schedule->command('web_traffic 3')->cron('*/12 * * * *'); // 引流 大于9个月的项目,12分钟一次
30 $schedule->command('sync_channel')->dailyAt('06:00')->withoutOverlapping(1); // 渠道信息,每周执行一次 30 $schedule->command('sync_channel')->dailyAt('06:00')->withoutOverlapping(1); // 渠道信息,每周执行一次
31 -// $schedule->command('sync_project')->everyMinute()->withoutOverlapping(1); //同步项目 31 + $schedule->command('sync_project')->everyMinute()->withoutOverlapping(1); //同步项目
32 $schedule->command('month_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计记录 32 $schedule->command('month_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计记录
33 $schedule->command('forward_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计转发询盘记录 33 $schedule->command('forward_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计转发询盘记录
34 -// $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开,转发询盘,每分钟执行一次 34 + $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开,转发询盘,每分钟执行一次
35 $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据,每天凌晨执行一次 35 $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据,每天凌晨执行一次
36 // // 更新域名|证书结束时间,每天凌晨1点执行一次 36 // // 更新域名|证书结束时间,每天凌晨1点执行一次
37 // $schedule->command('domain_time')->dailyAt('01:00')->withoutOverlapping(1); 37 // $schedule->command('domain_time')->dailyAt('01:00')->withoutOverlapping(1);
@@ -54,6 +54,7 @@ class ProjectLogic extends BaseLogic @@ -54,6 +54,7 @@ class ProjectLogic extends BaseLogic
54 if(!empty($info['online_check']['created_manage_id'])){ 54 if(!empty($info['online_check']['created_manage_id'])){
55 $info['online_check']['name'] = (new Manage())->read(['id'=>$info['online_check']['created_manage_id']])['name'] ?? ''; 55 $info['online_check']['name'] = (new Manage())->read(['id'=>$info['online_check']['created_manage_id']])['name'] ?? '';
56 } 56 }
  57 + $info['deploy_optimize']['minor_keywords'] = [];
57 if(isset($info['deploy_optimize']['minor_keywords']) && !empty($info['deploy_optimize']['minor_keywords'])){ 58 if(isset($info['deploy_optimize']['minor_keywords']) && !empty($info['deploy_optimize']['minor_keywords'])){
58 $info['deploy_optimize']['minor_keywords'] = json_decode($info['deploy_optimize']['minor_keywords']) ?? ''; 59 $info['deploy_optimize']['minor_keywords'] = json_decode($info['deploy_optimize']['minor_keywords']) ?? '';
59 } 60 }
@@ -143,7 +143,6 @@ class RankDataLogic extends BaseLogic @@ -143,7 +143,6 @@ class RankDataLogic extends BaseLogic
143 $domain = $project['deploy_optimize']['domain'] ?? ''; 143 $domain = $project['deploy_optimize']['domain'] ?? '';
144 $domain_arr = parse_url($domain); 144 $domain_arr = parse_url($domain);
145 $domain = $domain_arr['host'] ?? $domain_arr['path']; 145 $domain = $domain_arr['host'] ?? $domain_arr['path'];
146 -  
147 //复制站点域名 146 //复制站点域名
148 $ext_projects = $this->getExtendProjects(); 147 $ext_projects = $this->getExtendProjects();
149 $flg_ext = $this->getExtFlag($ext_projects, $domain, $api_no); 148 $flg_ext = $this->getExtFlag($ext_projects, $domain, $api_no);
@@ -152,8 +151,6 @@ class RankDataLogic extends BaseLogic @@ -152,8 +151,6 @@ class RankDataLogic extends BaseLogic
152 $ai_projects = $this->getAiProjects()['data'] ?? []; 151 $ai_projects = $this->getAiProjects()['data'] ?? [];
153 $flg_ai = $this->getAiFlag($ai_projects, $domain); 152 $flg_ai = $this->getAiFlag($ai_projects, $domain);
154 $ai_domain = str_replace('www.', '', $this->getAiProjects($domain)['domain'] ?? ''); 153 $ai_domain = str_replace('www.', '', $this->getAiProjects($domain)['domain'] ?? '');
155 -  
156 -  
157 $list = RankData::where('project_id', $project_id)->where('lang', $lang)->value('data'); 154 $list = RankData::where('project_id', $project_id)->where('lang', $lang)->value('data');
158 $list30 = []; //排名前三十的 155 $list30 = []; //排名前三十的
159 $list30_0 = []; //排名前三十且近三天没有排名的 156 $list30_0 = []; //排名前三十且近三天没有排名的
@@ -162,12 +159,10 @@ class RankDataLogic extends BaseLogic @@ -162,12 +159,10 @@ class RankDataLogic extends BaseLogic
162 foreach ($list as $key => $v) { 159 foreach ($list as $key => $v) {
163 $last = Arr::last($v); 160 $last = Arr::last($v);
164 $data = []; 161 $data = [];
165 -  
166 //处理日期 162 //处理日期
167 foreach ($v as $date => $position) { 163 foreach ($v as $date => $position) {
168 $data[date('m-d', strtotime($date . '+ 1 day'))] = $position['position']; 164 $data[date('m-d', strtotime($date . '+ 1 day'))] = $position['position'];
169 } 165 }
170 -  
171 //域名类型 166 //域名类型
172 $domain_text = '主域名:' . str_replace('www.', '', $domain); 167 $domain_text = '主域名:' . str_replace('www.', '', $domain);
173 if (!empty($last['r'])) { 168 if (!empty($last['r'])) {