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

@@ -19,6 +19,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('remain_day')->dailyAt('08:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('remain_day')->dailyAt('08:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
         $schedule->command('rank_data')->dailyAt('07:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
+        $schedule->command('rank_data')->dailyAt('08:00')->withoutOverlapping(1); // 排名数据，每天凌晨执行一次
         $schedule->command('rank_data_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
         $schedule->command('rank_data_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
         $schedule->command('rank_data_external_links')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
         $schedule->command('rank_data_external_links')->dailyAt('08:30')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
         $schedule->command('rank_data_external_links')->dailyAt('18:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
         $schedule->command('rank_data_external_links')->dailyAt('18:00')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次

@@ -172,8 +172,8 @@ class SyncSubmitTaskService
             throw new InquiryFilterException('项目不存在');
             throw new InquiryFilterException('项目不存在');
         }
         }
 
 
-        // 测试环境返回信息
-        if (FALSE !== strpos($domain, 'globalso.site') && !$project->is_record_test_visit) {
+        // 访问记录过滤测试环境
+        if ($type == SyncSubmitTask::TYPE_VISIT && FALSE !== strpos($domain, 'globalso.site') && !$project->is_record_test_visit) {
             throw new InquiryFilterException('测试环境过滤');
             throw new InquiryFilterException('测试环境过滤');
         }
         }
 
 
@@ -181,8 +181,8 @@ class SyncSubmitTaskService
             throw new InquiryFilterException('127.0.0.1过滤');
             throw new InquiryFilterException('127.0.0.1过滤');
         }
         }
         $country = self::getCountryByIp($ip);
         $country = self::getCountryByIp($ip);
-        //访问记录才过滤是否国内
-        if ($country == "中国" && !$project->is_record_china_visit && $type == SyncSubmitTask::TYPE_VISIT){
+        //访问记录过滤国内
+        if ($type == SyncSubmitTask::TYPE_VISIT && $country == "中国" && !$project->is_record_china_visit){
             throw new InquiryFilterException('中国内地过滤');
             throw new InquiryFilterException('中国内地过滤');
         }
         }
         return [
         return [