Merge remote-tracking branch 'origin/master' into akun

@@ -334,8 +334,9 @@ class RelayInquiry extends Command
                     foreach ($ad_task as $task){
                     foreach ($ad_task as $task){
                         //需要多个ip访问的国家 随机2-5次访问，只有一次询盘
                         //需要多个ip访问的国家 随机2-5次访问，只有一次询盘
                         if (in_array($val->country_name, $this->multiple_ip_visit_country)) {
                         if (in_array($val->country_name, $this->multiple_ip_visit_country)) {
-                            $times = mt_rand([2, 5]); //随机次数
-                            $inquiry_time = mt_rand([1, $times]); //第几次询盘
+                            $times = mt_rand(2, 5); //随机次数
+                            $inquiry_time = mt_rand(1, $times); //第几次询盘
+                            $this->output('多次访问模拟：' . $times);
                             for ($i = 1; $i <= $times; $i++) {
                             for ($i = 1; $i <= $times; $i++) {
                                 $res += $this->relayDetail($task, $val, $inquiry_time == $i);
                                 $res += $this->relayDetail($task, $val, $inquiry_time == $i);
                             }
                             }

@@ -167,9 +167,11 @@ class ProjectController extends BaseController
     public function searchType(&$query){
     public function searchType(&$query){
         if(isset($this->map['type'])){
         if(isset($this->map['type'])){
             $query->where('gl_project.extend_type', '!=' ,5);
             $query->where('gl_project.extend_type', '!=' ,5);
-            if (in_array($this->map['type'], [Project::TYPE_ZERO, Project::TYPE_ONE, Project::TYPE_TWO, Project::TYPE_THREE]))
+            if (in_array($this->map['type'], [Project::TYPE_ZERO, Project::TYPE_ONE, Project::TYPE_TWO, Project::TYPE_THREE])){
                 $query->where('gl_project.type', $this->map['type']);
                 $query->where('gl_project.type', $this->map['type']);
-            else{
+            } elseif ($this->map['type'] == 8){
+                $query->where('gl_project.online_check_id', null)->where('gl_project.type',Project::TYPE_TWO);
+            }else{
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
             }
             }
         }
         }

@@ -68,6 +68,9 @@ class AyrReleaseController extends BaseController
         if(isset($this->param['images']) && !empty($this->param['images'])){
         if(isset($this->param['images']) && !empty($this->param['images'])){
             $data['images'] = $this->param['images'];
             $data['images'] = $this->param['images'];
         }
         }
+        if(empty($data)){
+            $this->fail('媒体信息不能为空');
+        }
         //参数处理
         //参数处理
         $this->param['mediaUrls'] = $ayrReleaseLogic->image_file_param($data);
         $this->param['mediaUrls'] = $ayrReleaseLogic->image_file_param($data);
         $param = [
         $param = [

@@ -41,7 +41,7 @@ class OperationHeartbeatController extends BaseController
             'is_custom.required' => '是否为扩展模版',
             'is_custom.required' => '是否为扩展模版',
             'is_template.required' => '详情页/可视化',
             'is_template.required' => '详情页/可视化',
         ]);
         ]);
-        if(empty($this->param['source_id'])){
+        if(empty($this->param['source_id']) || ($this->param['source_id'] == 'NaN')){
             $this->response('success');
             $this->response('success');
         }
         }
         $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'source_id'=>$this->param['source_id'],
         $condition = ['project_id'=>$this->user['project_id'],'source'=>$this->param['source'],'source_id'=>$this->param['source_id'],