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

@@ -74,7 +74,8 @@ class NoticeController extends BaseController
         $task_id = $request->input('task_id');
         $status = intval($request->input('status', 0));
         $thumb = $request->input('video_thumb');
-        $video = $request->input('embed_code');
+        $video = $request->input('callback_resource');
+        $embed_code = $request->input('embed_code');
         $all = $request->all();
         // 获取子任务
         $log = KeywordVideoTaskLog::where(['task_id' => $task_id])->first();
@@ -97,6 +98,7 @@ class NoticeController extends BaseController
         if (empty($keyword))
             return 200;
         $keyword->video = $video;
+        $keyword->embed_code = $embed_code;
         $keyword->video_thumb = $thumb;
         $keyword->save();
         DB::disconnect('custom_mysql');