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

@@ -28,10 +28,10 @@ class Kernel extends ConsoleKernel
         $schedule->command('web_traffic 2')->cron('*/18 * * * *'); // 引流 4-8个月的项目，18分钟一次
         $schedule->command('web_traffic 3')->cron('*/12 * * * *'); // 引流 大于9个月的项目，12分钟一次
         $schedule->command('sync_channel')->dailyAt('06:00')->withoutOverlapping(1); // 渠道信息，每周执行一次
-//        $schedule->command('sync_project')->everyMinute()->withoutOverlapping(1); //同步项目
+        $schedule->command('sync_project')->everyMinute()->withoutOverlapping(1); //同步项目
         $schedule->command('month_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计记录
         $schedule->command('forward_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计转发询盘记录
-//        $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); // 询盘统计数据，每天凌晨执行一次
 //        // 更新域名|证书结束时间，每天凌晨1点执行一次
 //        $schedule->command('domain_time')->dailyAt('01:00')->withoutOverlapping(1);

@@ -54,6 +54,7 @@ class ProjectLogic extends BaseLogic
             if(!empty($info['online_check']['created_manage_id'])){
                 $info['online_check']['name'] = (new Manage())->read(['id'=>$info['online_check']['created_manage_id']])['name'] ?? '';
             }
+            $info['deploy_optimize']['minor_keywords'] = [];
             if(isset($info['deploy_optimize']['minor_keywords']) && !empty($info['deploy_optimize']['minor_keywords'])){
                 $info['deploy_optimize']['minor_keywords'] = json_decode($info['deploy_optimize']['minor_keywords']) ?? '';
             }

@@ -143,7 +143,6 @@ class RankDataLogic extends BaseLogic
         $domain = $project['deploy_optimize']['domain'] ?? '';
         $domain_arr = parse_url($domain);
         $domain = $domain_arr['host'] ?? $domain_arr['path'];
-
         //复制站点域名
         $ext_projects = $this->getExtendProjects();
         $flg_ext = $this->getExtFlag($ext_projects, $domain, $api_no);
@@ -152,8 +151,6 @@ class RankDataLogic extends BaseLogic
         $ai_projects = $this->getAiProjects()['data'] ?? [];
         $flg_ai = $this->getAiFlag($ai_projects, $domain);
         $ai_domain = str_replace('www.', '', $this->getAiProjects($domain)['domain'] ?? '');
-
-
         $list = RankData::where('project_id', $project_id)->where('lang', $lang)->value('data');
         $list30 = []; //排名前三十的
         $list30_0 = []; //排名前三十且近三天没有排名的
@@ -162,12 +159,10 @@ class RankDataLogic extends BaseLogic
         foreach ($list as $key => $v) {
             $last = Arr::last($v);
             $data = [];
-
             //处理日期
             foreach ($v as $date => $position) {
                 $data[date('m-d', strtotime($date . '+ 1 day'))] = $position['position'];
             }
-
             //域名类型
             $domain_text = '主域名：' . str_replace('www.', '', $domain);
             if (!empty($last['r'])) {