|
|
@@ -31,13 +31,14 @@ class EpisodeController extends CatchController
|
|
|
->where([
|
|
|
'video_id' => $request->integer('video_id'),
|
|
|
'is_enabled' => 1
|
|
|
- ])->select('series_name', 'series_sequence', 'video_url', 'duration')
|
|
|
+ ])->select('series_name', 'series_sequence', 'video_key', 'duration')
|
|
|
->orderBy('series_sequence', 'asc')
|
|
|
->paginate($request->integer('limit', 15));
|
|
|
foreach ($videoSeries as $series) {
|
|
|
$series->series_name = sprintf('第%s集', $series->series_sequence);
|
|
|
$series->is_charge = $series->series_sequence >= $video->charge_sequence;
|
|
|
$series->duration_str = gmdate('H:i:s', $series->duration);
|
|
|
+ $series->video_url = config('common.qiniu.publicVideoLinkDomain') . DIRECTORY_SEPARATOR . $series->video_key;
|
|
|
$series->public_video_url = QiniuTokenService::getPrivateSourceDownloadUrl($series->video_url);
|
|
|
$series->download_video_url = QiniuTokenService::getPrivateSourceDownloadUrl($series->video_url.'?attname='.urlencode($series->series_name).'.mp4');
|
|
|
}
|
|
|
@@ -49,9 +50,9 @@ class EpisodeController extends CatchController
|
|
|
$this->validate($request, [
|
|
|
'video_id' => 'required',
|
|
|
'videos' => 'required|array|min:1',
|
|
|
- 'videos.*.url' => 'required',
|
|
|
'videos.*.name' => 'required',
|
|
|
- 'videos.*.duration' => 'required|integer|min:1'
|
|
|
+ 'videos.*.duration' => 'required|integer|min:1',
|
|
|
+ 'videos.*.key' => 'required',
|
|
|
]);
|
|
|
VideoService::getVideoByIdOrException($request->input('video_id'));
|
|
|
$videos = $request->input('videos');
|
|
|
@@ -60,7 +61,7 @@ class EpisodeController extends CatchController
|
|
|
foreach ($videos as $item) {
|
|
|
$data[] = [
|
|
|
'video_id' => $request->input('video_id'),
|
|
|
- 'video_url' => $item['url'],
|
|
|
+ 'video_key' => $item['key'],
|
|
|
'series_name' => $item['name'],
|
|
|
'series_sequence' => intval(explode('_', $item['name'])[0]),
|
|
|
'duration' => $item['duration'],
|
