作者 lyh

gx

@@ -196,11 +196,11 @@ class VideoTask extends Command @@ -196,11 +196,11 @@ class VideoTask extends Command
196 { 196 {
197 197
198 $keyword_id = Keyword::where('video', null)->whereIn("title", $keywords)->whereNull('deleted_at') 198 $keyword_id = Keyword::where('video', null)->whereIn("title", $keywords)->whereNull('deleted_at')
199 - ->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->limit($number)->pluck('id')->toArray(); 199 + ->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->inRandomOrder()->take($number)->pluck('id')->toArray();
200 $need = $number - count($keyword_id); 200 $need = $number - count($keyword_id);
201 if ($need > 0) { 201 if ($need > 0) {
202 $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')->whereNull('deleted_at') 202 $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')->whereNull('deleted_at')
203 - ->whereNotNull('keyword_content')->whereNotIn('id', $keyword_id)->orderBy('id','asc')->limit($need)->pluck('id')->toArray(); 203 + ->whereNotNull('keyword_content')->whereNotIn('id', $keyword_id)->orderBy('id','asc')->inRandomOrder()->take($need)->pluck('id')->toArray();
204 } 204 }
205 $keyword_arr_id = array_merge($keyword_id, $keyword_arr_id); 205 $keyword_arr_id = array_merge($keyword_id, $keyword_arr_id);
206 $keyword = Keyword::whereIn("id", $keyword_arr_id)->get(); 206 $keyword = Keyword::whereIn("id", $keyword_arr_id)->get();