Merge branch 'liuzj-permission-dev' into test

modules/Video/Http/Controllers/EpisodeController.php

@@ -38,11 +38,9 @@ class EpisodeController extends CatchController
             $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->public_video_url = QiniuTokenService::getPrivateSourceDownloadUrl(
-                config('common.qiniu.publicVideoLinkDomain') . DIRECTORY_SEPARATOR . $series->video_key);
-            $series->download_video_url = QiniuTokenService::getPrivateSourceDownloadUrl(
-                config('common.qiniu.downloadVideoLinkDomain') . DIRECTORY_SEPARATOR .
-                $series->video_key.'?attname='.urlencode($series->series_name).'.mp4');
+            $series->public_video_url = config('common.qiniu.publicVideoLinkDomain') . DIRECTORY_SEPARATOR . $series->video_key;
+            $series->download_video_url = config('common.qiniu.downloadVideoLinkDomain') . DIRECTORY_SEPARATOR .
+                $series->video_key.'?attname='.urlencode($series->series_name).'.mp4';
         }
 
         return $videoSeries;