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

@@ -61,9 +61,8 @@ class TemplateLog extends Command
      * @time   :2024/7/10 14:48
      * @time   :2024/7/10 14:48
      */
      */
     public function deleteTemplate(){
     public function deleteTemplate(){
-        $startDate = date("Y-m-01 00:00:00");
-        $endDate = date("Y-m-t 23:59:59");
+        $date = date('Y-m-d H:i:s', strtotime('-30 days'));
         $templateLogModel = new BTemplateLog();
         $templateLogModel = new BTemplateLog();
-        return $templateLogModel->del(['created_at'=>['not between'=>[$startDate,$endDate]]]);
+        return $templateLogModel->del(['created_at'=>['<=',$date]]);
     }
     }
 }
 }

@@ -37,8 +37,6 @@ class Kernel extends ConsoleKernel
         $schedule->command('update_keyword_route')->dailyAt('01:00')->withoutOverlapping(1); //升级项目--清除路由相同的关键字
         $schedule->command('update_keyword_route')->dailyAt('01:00')->withoutOverlapping(1); //升级项目--清除路由相同的关键字
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         $schedule->command('update_keyword_content')->hourly()->withoutOverlapping(1);
         $schedule->command('update_keyword_content')->hourly()->withoutOverlapping(1);
-        // 每月15号执行任务
-        $schedule->command('delete_template_log')->monthlyOn(15, '00:01')->withoutOverlapping();
         // 每日推送已完成视频任务项目生成对应界面
         // 每日推送已完成视频任务项目生成对应界面
         //更新AI站点数据
         //更新AI站点数据
         $schedule->command('updateAiProjects')->everyFourHours()->withoutOverlapping(1);
         $schedule->command('updateAiProjects')->everyFourHours()->withoutOverlapping(1);

@@ -131,7 +131,14 @@ class RankDataLogic extends BaseLogic
             'Robots.txt文件优化',
             'Robots.txt文件优化',
             'Google站长工具优化设置'
             'Google站长工具优化设置'
         ];
         ];
-
+        if($project['type'] == 3){
+            $data['seo'] = [
+                'H1,H2,H3标签',
+                'TDK设置(Title, Description, Keywords)',
+                'Sitemap.xml Google站长地图',
+                'Robots.txt文件优化',
+            ];
+        }
         //外链引荐域名
         //外链引荐域名
         $recomm_domain = $recomm_domain ? $recomm_domain->toArray() : [];
         $recomm_domain = $recomm_domain ? $recomm_domain->toArray() : [];
         $recomm_domain['data'] = Collection::make($recomm_domain['data'] ?? [])->sortBy('backlinks_num')->all();
         $recomm_domain['data'] = Collection::make($recomm_domain['data'] ?? [])->sortBy('backlinks_num')->all();