作者 lyh

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

@@ -23,6 +23,9 @@ class Kernel extends ConsoleKernel @@ -23,6 +23,9 @@ class Kernel extends ConsoleKernel
23 $schedule->command('rank_data_recomm_domain')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据-引荐域名,每周一凌晨执行一次 23 $schedule->command('rank_data_recomm_domain')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据-引荐域名,每周一凌晨执行一次
24 $schedule->command('rank_data_week')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据,每周一凌晨执行一次 24 $schedule->command('rank_data_week')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据,每周一凌晨执行一次
25 $schedule->command('share_user')->dailyAt('01:00')->withoutOverlapping(1); // 清除用户ayr_share数据,每天凌晨1点执行一次 25 $schedule->command('share_user')->dailyAt('01:00')->withoutOverlapping(1); // 清除用户ayr_share数据,每天凌晨1点执行一次
  26 + $schedule->command('visit', ['type' => 1])->everyThirtyMinutes(); // 引流 1-3个月的项目,半小时一次
  27 + $schedule->command('visit', ['type' => 2])->cron('*/18 * * * *'); // 引流 4-8个月的项目,18分钟一次
  28 + $schedule->command('visit', ['type' => 3])->cron('*/12 * * * *'); // 引流 大于9个月的项目,12分钟一次
26 } 29 }
27 30
28 /** 31 /**
@@ -20,7 +20,7 @@ class DomainInfoLogic extends BaseLogic @@ -20,7 +20,7 @@ class DomainInfoLogic extends BaseLogic
20 public function getDomainInfo($project_id) 20 public function getDomainInfo($project_id)
21 { 21 {
22 $project = app(ProjectLogic::class)->getInfo($project_id); 22 $project = app(ProjectLogic::class)->getInfo($project_id);
23 - $domain = $project['deploy_optimize']['domain']; 23 + $domain = $project['deploy_optimize']['domain'] ?? '';
24 $info = $this->model->where('project_id', $project_id)->first(); 24 $info = $this->model->where('project_id', $project_id)->first();
25 //不存在或时间过期了 重新获取信息 25 //不存在或时间过期了 重新获取信息
26 $expiration_date = $info['domain_info']['expiration_date'] ?? ''; 26 $expiration_date = $info['domain_info']['expiration_date'] ?? '';
@@ -31,7 +31,7 @@ class InquiryLogic extends BaseLogic @@ -31,7 +31,7 @@ class InquiryLogic extends BaseLogic
31 $search = $this->request['search'] ?: ''; 31 $search = $this->request['search'] ?: '';
32 $page = $this->request['page'] ?: 1; 32 $page = $this->request['page'] ?: 1;
33 $project = (new ProjectLogic())->getInfo($this->user['project_id']); 33 $project = (new ProjectLogic())->getInfo($this->user['project_id']);
34 - $domain = $project['deploy_optimize']['domain'] ?: ''; 34 + $domain = $project['deploy_optimize']['domain'] ?? '';
35 $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size); 35 $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size);
36 //处理格式 免得前端又改 36 //处理格式 免得前端又改
37 $data = [ 37 $data = [