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

@@ -216,7 +216,9 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
         }
         }
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
-        $query = $query->where('gl_project_online_check.qa_status',1);
+        $query->where(function ($subQuery) {
+            $subQuery->orwhere('gl_project_online_check.qa_status',1)->orwhere('gl_project.is_upgrade',1);
+        });
         return $query;
         return $query;
     }
     }
 
 

@@ -276,9 +276,6 @@ class ProductLogic extends  BaseLogic
             $param['thumb'] =  Arr::a2s([]);
             $param['thumb'] =  Arr::a2s([]);
         }
         }
         if(isset($param['video']) && !empty($param['video'])){
         if(isset($param['video']) && !empty($param['video'])){
-            foreach ($param['video'] as $k => $v){
-                $param['video'][$k] = $v;
-            }
             $param['video'] = Arr::a2s($param['video'] ?? []);
             $param['video'] = Arr::a2s($param['video'] ?? []);
         }else{
         }else{
             $param['video'] = Arr::a2s([]);
             $param['video'] = Arr::a2s([]);

+<?php
+
+namespace App\Listeners;
+
+use App\Events\UpdateHtml;
+use App\Jobs\updateHtmlJob;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class CopyProjectListener implements ShouldQueue
+{
+    /**
+     * 更新页面
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  UpdateHtml  $event
+     * @return void
+     */
+    public function handle(UpdateHtml $event)
+    {
+        $data = $event->data;
+        dump($data);
+    }
+}