Merge remote-tracking branch 'origin/master' into akun

@@ -44,9 +44,9 @@ class ShareUser extends Command
         //获取所有ayr_share用户
         //获取所有ayr_share用户
         $ayr_share_model = new AyrShareModel();
         $ayr_share_model = new AyrShareModel();
         $ayr_release = new AyrReleaseModel();
         $ayr_release = new AyrReleaseModel();
-        $ayr_share_list = $ayr_share_model->list(['profile_key'=>['!=','']]);
+        $ayr_share_list = $ayr_share_model->list(['profile_key'=>['!=',''],'project_id'=>410]);
         foreach ($ayr_share_list as $v){
         foreach ($ayr_share_list as $v){
-            $time = Carbon::now()->modify('-7 days')->toDateString();
+            $time = Carbon::now()->modify('-1 days')->toDateString();
             //创建时间小于7天前的当前时间
             //创建时间小于7天前的当前时间
             if($v['created_at'] > $time){
             if($v['created_at'] > $time){
                 continue;
                 continue;

@@ -29,6 +29,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
         $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
 //        $schedule->command('domain_info')->dailyAt('01:20')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
 //        $schedule->command('domain_info')->dailyAt('01:20')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
+                $schedule->command('share_user')->dailyAt('01:20')->withoutOverlapping(1);// 每天凌晨1点执行一次
         $schedule->command('last_inquiry')->dailyAt('04:00')->withoutOverlapping(1);// 最近一次询盘信息
         $schedule->command('last_inquiry')->dailyAt('04:00')->withoutOverlapping(1);// 最近一次询盘信息
         $schedule->command('update_seo_tdk_crontab')->dailyAt('20:00')->withoutOverlapping(1); //更新上线项目TDK
         $schedule->command('update_seo_tdk_crontab')->dailyAt('20:00')->withoutOverlapping(1); //更新上线项目TDK
         $schedule->command('sync_manager')->dailyAt('01:00')->withoutOverlapping(1); //TODO::手机号码同步  每天执行一次
         $schedule->command('sync_manager')->dailyAt('01:00')->withoutOverlapping(1); //TODO::手机号码同步  每天执行一次

@@ -68,6 +68,9 @@ class CustomTemplateLogic extends BaseLogic
         if(($this->project['deploy_build']['is_search'] == 0) && ($this->param['url'] == 'search')){
         if(($this->project['deploy_build']['is_search'] == 0) && ($this->param['url'] == 'search')){
             $this->fail('请先开启搜索页可视化');
             $this->fail('请先开启搜索页可视化');
         }
         }
+        if(($this->project['deploy_build']['is_keyword'] == 0) && ($this->param['url'] == 'keyword')){
+            $this->fail('请先开启聚合页可视化');
+        }
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $id = $this->param['id'];
             $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
             $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0