周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 ecdded3f2c461e2f818faecf453542e6d23a8ae7 1 个父辈 198e152e

update

内嵌 并排对比
正在显示 4 个修改的文件 包含 16 行增加 和 0 行删除
@@ -434,6 +434,10 @@ class WebTraffic extends Command @@ -434,6 +434,10 @@ class WebTraffic extends Command
434 $query->whereNotIn('ip_area', $main_countries); 434 $query->whereNotIn('ip_area', $main_countries);
435 } 435 }
436 })->inRandomOrder()->first(); 436 })->inRandomOrder()->first();
  437 + if(!$ipdata){
  438 + $data[] = [];
  439 + continue;
  440 + }
437 $ipdata = (array)$ipdata ?: []; 441 $ipdata = (array)$ipdata ?: [];
438 $ipdata['diff'] = $time_zones[$ipdata['ip_area']]; 442 $ipdata['diff'] = $time_zones[$ipdata['ip_area']];
439 $data[] = $ipdata; 443 $data[] = $ipdata;
@@ -479,6 +479,10 @@ class WebTrafficRussia extends Command @@ -479,6 +479,10 @@ class WebTrafficRussia extends Command
479 } 479 }
480 $ip_area = $this->get_rand($project_country); 480 $ip_area = $this->get_rand($project_country);
481 $res = DB::table('gl_xunpan_ipdata')->where('ip_area', $ip_area)->inRandomOrder()->first(); 481 $res = DB::table('gl_xunpan_ipdata')->where('ip_area', $ip_area)->inRandomOrder()->first();
  482 + if(!$res){
  483 + $data[] = [];
  484 + continue;
  485 + }
482 $res = (array)$res ?: []; 486 $res = (array)$res ?: [];
483 $res['diff'] = $time_zones[$res['ip_area']]; 487 $res['diff'] = $time_zones[$res['ip_area']];
484 $data[] = $res; 488 $data[] = $res;
@@ -470,6 +470,10 @@ class WebTrafficRussiaSpecial extends Command @@ -470,6 +470,10 @@ class WebTrafficRussiaSpecial extends Command
470 } 470 }
471 $ip_area = $this->get_rand($project_country); 471 $ip_area = $this->get_rand($project_country);
472 $res = DB::table('gl_xunpan_ipdata')->where('ip_area', $ip_area)->inRandomOrder()->first(); 472 $res = DB::table('gl_xunpan_ipdata')->where('ip_area', $ip_area)->inRandomOrder()->first();
  473 + if(!$res){
  474 + $data[] = [];
  475 + continue;
  476 + }
473 $res = (array)$res ?: []; 477 $res = (array)$res ?: [];
474 $res['diff'] = $time_zones[$res['ip_area']]; 478 $res['diff'] = $time_zones[$res['ip_area']];
475 $data[] = $res; 479 $data[] = $res;
@@ -420,6 +420,10 @@ class WebTrafficSpecial extends Command @@ -420,6 +420,10 @@ class WebTrafficSpecial extends Command
420 $query->whereNotIn('ip_area', $main_countries); 420 $query->whereNotIn('ip_area', $main_countries);
421 } 421 }
422 })->inRandomOrder()->first(); 422 })->inRandomOrder()->first();
  423 + if(!$ipdata){
  424 + $data[] = [];
  425 + continue;
  426 + }
423 $ipdata = (array)$ipdata ?: []; 427 $ipdata = (array)$ipdata ?: [];
424 $ipdata['diff'] = $time_zones[$ipdata['ip_area']]; 428 $ipdata['diff'] = $time_zones[$ipdata['ip_area']];
425 $data[] = $ipdata; 429 $data[] = $ipdata;