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

@@ -19,13 +19,13 @@ class Kernel extends ConsoleKernel
         $schedule->command('remain_day')->dailyAt('08:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务
         $schedule->command('rank_data')->dailyAt('07: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_speed')->dailyAt('01:10')->withoutOverlapping(1); // 排名数据-测速数据，每周一凌晨执行一次
+        $schedule->command('rank_data_external_links')->dailyAt('01:20')->withoutOverlapping(1); // 排名数据-外链，每周一凌晨执行一次
+        $schedule->command('rank_data_indexed_pages')->dailyAt('01:30')->withoutOverlapping(1); // 排名数据-页面收录，每周一凌晨执行一次
+        $schedule->command('rank_data_recomm_domain')->dailyAt('01:40')->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('count')->dailyAt('01:00')->withoutOverlapping(1); //每天凌晨1点执行一次
+        $schedule->command('count')->dailyAt('01:30')->withoutOverlapping(1); //每天凌晨1点执行一次
         $schedule->command('service_count')->dailyAt('01:00')->withoutOverlapping(1); //服务器使用情况，每天凌晨1点执行一次
         $schedule->command('web_traffic 1')->everyThirtyMinutes(); // 引流 1-3个月的项目,半小时一次
         $schedule->command('web_traffic 2')->cron('*/18 * * * *'); // 引流 4-8个月的项目，18分钟一次
@@ -35,7 +35,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('forward_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计转发询盘记录
         $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
-        $schedule->command('domain_info')->dailyAt('01:00')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
+        $schedule->command('domain_info')->dailyAt('01:20')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
         $schedule->command('last_inquiry')->dailyAt('04:00')->withoutOverlapping(1);// 最近一次询盘信息
 //        $schedule->command('update_progress')->everyThirtyMinutes()->withoutOverlapping(1);//监控更新
         $schedule->command('update_seo_tdk_crontab')->dailyAt('00:00')->withoutOverlapping(1); //更新上线项目TDK
@@ -45,6 +45,10 @@ class Kernel extends ConsoleKernel
 
         $schedule->command('recommended_suppliers')->dailyAt('01:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
         $schedule->command('notice_c')->dailyAt('02:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
+        // 每日推送视频任务
+        $schedule->command('video_task')->dailyAt('01:30')->withoutOverlapping(1);
+        // 每日推送已完成视频任务项目生成对应界面
+        $schedule->command('notice_c')->dailyAt('02:00')->withoutOverlapping(1);
     }
 
     /**

@@ -13,6 +13,7 @@ use App\Models\Product\Product;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
+use App\Models\User\User;
 use App\Services\ProjectServer;
 use Illuminate\Http\Request;
 
@@ -98,4 +99,32 @@ class PrivateController extends BaseController
         }
         return $this->success($result);
     }
+
+    /**
+     * 验证当前用户是否存在
+     * TODO 查询手机号码是否是项目用户， 如果升级项目未上线项目return false;
+     * @param Request $request
+     * @return false|string
+     */
+    public function hasUser(Request $request)
+    {
+        // 获取数据，初始化信息
+        $mobile = trim($request->input('mobile'));
+        $result = ['mobile' => $mobile, 'v6_user' => false];
+
+        // 获取用户，验证用户
+        $project_ids = User::where(['mobile' => $mobile])->pluck('project_id')->toArray();
+        if (empty($project_ids))
+            return $this->success($result);
+
+        $projects = Project::whereIn('id', $project_ids)->where('delete_status', 0)->get();
+        foreach ($projects as $project) {
+            // 如果是升级项目 并且未上线状态，不算做有效用户
+            if ($project->is_upgrade == Project::IS_UPGRADE_TRUE && $project->type <= Project::TYPE_ONE)
+                continue;
+            $result['v6_user'] = true;
+        }
+
+        return $this->success($result);
+    }
 }
\ No newline at end of file

@@ -24,4 +24,7 @@ Route::get('get_project_route', [\App\Http\Controllers\Api\PrivateController::cl
 Route::any('get_product_images', [\App\Http\Controllers\Api\ProductController::class, 'getImages'])->name('api.get_product_images');
 Route::post('inquiry_submit', [\App\Http\Controllers\Api\InquiryController::class, 'submit'])->name('api.inquiry_submit');
 Route::any('getOptimizationReport', [\App\Http\Controllers\Api\OptimizationReportController::class, 'getOptimizationReport'])->name('api.getOptimizationReport');
+// 视频任务回调信息
 Route::post('video_task_callback', [\App\Http\Controllers\Api\NoticeController::class, 'videoTaskCallback'])->name('api.video_task_callback');
+// 验证是否为6.0用户
+Route::any('has_user', [\App\Http\Controllers\Api\PrivateController::class, 'hasUser'])->name('api.has_user');