作者 张关杰

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

@@ -308,7 +308,8 @@ class VideoTask extends Command @@ -308,7 +308,8 @@ class VideoTask extends Command
308 } 308 }
309 } 309 }
310 } else { 310 } else {
311 - $image = $elements->find('img', 0); 311 +
  312 + $image = $dom->find('.section-banner-wrap-block',0)->find('img', 0);
312 } 313 }
313 if($image != null){ 314 if($image != null){
314 $bg = $image->src; 315 $bg = $image->src;
@@ -310,7 +310,7 @@ class WebTraffic extends Command @@ -310,7 +310,7 @@ class WebTraffic extends Command
310 $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString(); 310 $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
311 $query->where('pdo.start_date', '<', $startTime); 311 $query->where('pdo.start_date', '<', $startTime);
312 } 312 }
313 - })->select(['pdo.project_id','gl_project.main_lang_id'])->forPage($page, 500)->get(); 313 + })->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get();
314 //其他地方在引流的域名 314 //其他地方在引流的域名
315 $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); 315 $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
316 $data = []; 316 $data = [];
@@ -346,7 +346,7 @@ class WebTrafficRussia extends Command @@ -346,7 +346,7 @@ class WebTrafficRussia extends Command
346 $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString(); 346 $startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
347 $query->where('pdo.start_date', '<', $startTime); 347 $query->where('pdo.start_date', '<', $startTime);
348 } 348 }
349 - })->select(['pdo.project_id','gl_project.main_lang_id'])->forPage($page, 500)->get(); 349 + })->select(['pdo.project_id','gl_project.main_lang_id','gl_project.id'])->forPage($page, 500)->get();
350 //其他地方在引流的域名 350 //其他地方在引流的域名
351 $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray(); 351 $other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
352 $data = []; 352 $data = [];
@@ -48,7 +48,7 @@ class Kernel extends ConsoleKernel @@ -48,7 +48,7 @@ class Kernel extends ConsoleKernel
48 48
49 $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商 49 $schedule->command('recommended_suppliers')->dailyAt('03:00')->withoutOverlapping(1); //每天凌晨1点执行一次生成推荐商
50 // 每日推送视频任务 50 // 每日推送视频任务
51 - $schedule->command('video_task')->dailyAt('03:30')->withoutOverlapping(1); 51 + $schedule->command('video_task')->dailyAt('02:30')->withoutOverlapping(1);
52 // 每日推送已完成视频任务项目生成对应界面 52 // 每日推送已完成视频任务项目生成对应界面
53 $schedule->command('notice_c')->dailyAt('04:00')->withoutOverlapping(1); 53 $schedule->command('notice_c')->dailyAt('04:00')->withoutOverlapping(1);
54 } 54 }