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

@@ -99,7 +99,7 @@ class VideoTask extends Command
                     'project_id' => $task_project->project_id,
                     'project_id' => $task_project->project_id,
                     'keyword_id' => $val->id,
                     'keyword_id' => $val->id,
                     'keyword' => $val->title,
                     'keyword' => $val->title,
-                    'data' => json_encode(['url' => $keywordInfo['url'],'title' => $keywordInfo['title'], 'description' => $keywordInfo['keyword_content'], 'images' => $keywordInfo['product_list'], 'keywords' => []]),
+                    'data' => json_encode(['url' => $keywordInfo['url'],'title' => $keywordInfo['title'], 'description' => $keywordInfo['keyword_content'], 'images' => $keywordInfo['product_list'], 'keywords' => $keywordInfo['keyword_list']]),
                     'status' => KeywordVideoTaskLog::STATUS_INIT,
                     'status' => KeywordVideoTaskLog::STATUS_INIT,
                     'updated_at' => date('Y-m-d H:i:s'),
                     'updated_at' => date('Y-m-d H:i:s'),
                     'created_at' => date('Y-m-d H:i:s'),
                     'created_at' => date('Y-m-d H:i:s'),
@@ -129,7 +129,7 @@ class VideoTask extends Command
                 'project_data' => [
                 'project_data' => [
                     'tag_url' => $valData['url'],
                     'tag_url' => $valData['url'],
                     'title' => $valData['title'],
                     'title' => $valData['title'],
-                    'keywords' => [],
+                    'keywords' => $valData['keywords'],
                     'description' => $valData['description'],
                     'description' => $valData['description'],
                     'images' => $valData['images']
                     'images' => $valData['images']
                 ],
                 ],
@@ -183,12 +183,14 @@ class VideoTask extends Command
         if(!empty($domainInfo)){
         if(!empty($domainInfo)){
             $keywordInfo['route'] = $domainInfo['domain'].'/'.$keywordInfo['route'];
             $keywordInfo['route'] = $domainInfo['domain'].'/'.$keywordInfo['route'];
         }
         }
+        $keyword_arr = Keyword::where("project_id",$project_id)->where("status",1)->inRandomOrder()->take(10)->pluck('title')->toArray();;
         $data = [
         $data = [
             'url'=>$keywordInfo['route'],
             'url'=>$keywordInfo['route'],
             'title'=>$keywordInfo['title'],
             'title'=>$keywordInfo['title'],
             'keyword_title'=>$keywordInfo['keyword_title'],
             'keyword_title'=>$keywordInfo['keyword_title'],
             'keyword_content'=>$keywordInfo['keyword_content'],
             'keyword_content'=>$keywordInfo['keyword_content'],
-            'product_list'=>$thumb ?? []
+            'product_list'=>$thumb ?? [],
+            'keyword_list'=>$keyword_arr ?? []
         ];
         ];
         return $data;
         return $data;
     }
     }
@@ -225,4 +227,6 @@ class VideoTask extends Command
         return $data;
         return $data;
     }
     }
 
 
+
+
 }
 }