Merge branch 'liuzj-permission-dev' into test

modules/Video/Http/Controllers/EpisodeController.php

@@ -39,6 +39,7 @@ class EpisodeController extends CatchController
             $series->is_charge = $series->series_sequence >= $video->charge_sequence;
             $series->duration_str = gmdate('H:i:s', $series->duration);
             $series->public_video_url = QiniuTokenService::getPrivateSourceDownloadUrl($series->video_url);
+            $series->download_video_url = QiniuTokenService::getPrivateSourceDownloadUrl($series->video_url.'?attname='.urlencode($series->series_name).'.mp4');
         }
 
         return $videoSeries;

tests/Video/Http/Controllers/EpisodeControllerTest.php

@@ -14,7 +14,7 @@ class EpisodeControllerTest extends UsedTestCase
         $res = $this->withHeaders([
             'Authorization' => 'Bearer '. $this->token,
         ])->json('get','http://localhost/api/videoStock/episode/list', [
-            'video_id' => 1
+            'video_id' => 3
         ]);
         $this->dumpJson($res);
     }