update

@@ -47,7 +47,7 @@ class ExternalLinks extends BaseCommands
                 continue;
                 continue;
             }
             }
             $model = ExternalLinksModel::where('project_id', $project_id)->first();
             $model = ExternalLinksModel::where('project_id', $project_id)->first();
-            if ($model && $model->updated_date == getThisWeekStarDate()) {
+            if ($model && $model->updated_date >= getThisWeekStarDate()) {
                 continue;
                 continue;
             }
             }
             if (!$model) {
             if (!$model) {

@@ -42,7 +42,7 @@ class IndexedPages extends BaseCommands
         LogUtils::info('start rank_data_indexed_pages:' . count($list));
         LogUtils::info('start rank_data_indexed_pages:' . count($list));
         foreach ($list as $project_id => $api_no) {
         foreach ($list as $project_id => $api_no) {
             $model = IndexedPagesModel::where('project_id', $project_id)->first();
             $model = IndexedPagesModel::where('project_id', $project_id)->first();
-            if($model && $model->updated_date == getThisWeekStarDate()){
+            if($model && $model->updated_date >= getThisWeekStarDate()){
                 continue;
                 continue;
             }
             }
 
 

@@ -53,7 +53,7 @@ class RankWeek extends BaseCommands
         LogUtils::info('start rank_data_week:' . count($list));
         LogUtils::info('start rank_data_week:' . count($list));
         foreach ($list as $project_id => $api_no) {
         foreach ($list as $project_id => $api_no) {
             $rank_week = RankWeekModel::where('project_id', $project_id)->first();
             $rank_week = RankWeekModel::where('project_id', $project_id)->first();
-            if ($rank_week && $rank_week->updated_date == getThisWeekStarDate()) {
+            if ($rank_week && $rank_week->updated_date >= getThisWeekStarDate()) {
                 //本周数据已更新
                 //本周数据已更新
                 continue;
                 continue;
             }
             }

@@ -46,7 +46,7 @@ class RecommDomain extends BaseCommands
                 continue;
                 continue;
             }
             }
             $model = RecommDomainModel::where('project_id', $project_id)->first();
             $model = RecommDomainModel::where('project_id', $project_id)->first();
-            if ($model && $model->updated_date == getThisWeekStarDate()) {
+            if ($model && $model->updated_date >= getThisWeekStarDate()) {
                 continue;
                 continue;
             }
             }
             if (!$model) {
             if (!$model) {

@@ -47,7 +47,7 @@ class Speed extends BaseCommands
         LogUtils::info('start rank_data_speed:' . count($list));
         LogUtils::info('start rank_data_speed:' . count($list));
         foreach ($list as $project_id => $domain) {
         foreach ($list as $project_id => $domain) {
             $model = GoogleSpeedModel::where('project_id', $project_id)->first();
             $model = GoogleSpeedModel::where('project_id', $project_id)->first();
-            if ($model && $model->updated_date == getThisWeekStarDate()) {
+            if ($model && $model->updated_date >= getThisWeekStarDate()) {
                 //今周已更新 跳过
                 //今周已更新 跳过
                 continue;
                 continue;
             }
             }

@@ -19,11 +19,11 @@ class Kernel extends ConsoleKernel
         $schedule->command('remain_day')->dailyAt('03:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('remain_day')->dailyAt('03:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
         $schedule->command('rank_data')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
-        $schedule->command('rank_data_speed')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
-        $schedule->command('rank_data_external_links')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
-        $schedule->command('rank_data_indexed_pages')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
-        $schedule->command('rank_data_recomm_domain')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
-        $schedule->command('rank_data_week')->weeklyOn(1, '01:00')->withoutOverlapping(1); // 排名数据，每周一凌晨执行一次
+        $schedule->command('rank_data_speed')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
+        $schedule->command('rank_data_external_links')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
+        $schedule->command('rank_data_indexed_pages')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
+        $schedule->command('rank_data_recomm_domain')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据-引荐域名，每周一凌晨执行一次
+        $schedule->command('rank_data_week')->dailyAt('01:00')->withoutOverlapping(1); // 排名数据，每周一凌晨执行一次
 //        $schedule->command('share_user')->dailyAt('01:00')->withoutOverlapping(1); // 清除用户ayr_share数据，每天凌晨1点执行一次
 //        $schedule->command('share_user')->dailyAt('01:00')->withoutOverlapping(1); // 清除用户ayr_share数据，每天凌晨1点执行一次
         $schedule->command('count')->dailyAt('01:00')->withoutOverlapping(1); //每天凌晨1点执行一次
         $schedule->command('count')->dailyAt('01:00')->withoutOverlapping(1); //每天凌晨1点执行一次
         $schedule->command('web_traffic 1')->everyThirtyMinutes(); // 引流 1-3个月的项目,半小时一次
         $schedule->command('web_traffic 1')->everyThirtyMinutes(); // 引流 1-3个月的项目,半小时一次

@@ -357,7 +357,7 @@ class RankDataLogic extends BaseLogic
      * @author zbj
      * @author zbj
      * @date 2023/9/20
      * @date 2023/9/20
      */
      */
-    public function syncRankData($api_no, $site_res, $force){
+    public function syncRankData($api_no, $site_res, $force=false){
         $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('project_id');
         $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('project_id');
         foreach ($project_ids as $project_id) {
         foreach ($project_ids as $project_id) {
             $project = Project::find($project_id);
             $project = Project::find($project_id);