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

@@ -167,7 +167,7 @@ class VideoTask extends Command
      */
      */
     public function getProjectKeyword($number)
     public function getProjectKeyword($number)
     {
     {
-        $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag%')->whereNotNull('keyword_content')->pluck('id')->toArray();
+        $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%tag%')->whereNotNull('keyword_content')->pluck('id')->toArray();
         $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         return $keyword;
         return $keyword;