Merge branch 'liuzj-permission-dev' into test

modules/Common/config/qiniu.php

@@ -11,19 +11,23 @@ return [
     /**
      * 资源链接域名
      */
-    'linkDomain' => env('QINIU_LINK_DOMAIN', 'http://video-cdn.zvyhjkx.com'),
+    'linkDomain' => env('QINIU_LINK_DOMAIN', 'https://video-cdn.zvyhjkx.com'),
     'publicLinkDomain' => env('QINIU_PUBLIC_LINK_DOMAIN', 'https://minifile-cdn.zvyhjkx.com'),
     /**
      * 公开视频资源域名
      */
-    'publicVideoLinkDomain' => env('QINIU_PUBLIC_VIDEO_LINK_DOMAIN', 'http://video-cdn.zvyhjkx.com'),
+    'publicVideoLinkDomain' => env('QINIU_PUBLIC_VIDEO_LINK_DOMAIN', 'https://video-cdn.zvyhjkx.com'),
     /**
      * 下载使用的资源域名
      */
-    'downloadVideoLinkDomain' => env('QINIU_DOWNLOAD_VIDEO_LINK_DOMINA', 'http://video-cdn.zvyhjkx.com'),
+    'downloadVideoLinkDomain' => env('QINIU_DOWNLOAD_VIDEO_LINK_DOMAIN', 'https://video-cdn.zvyhjkx.com'),
     /**
      * 视频保存的环境
      * 1-正式,2-测试
      */
     'videoEnv' => env('QINIU_VIDEO_ENV', 1),
+    /**
+     * 视频源文件下载地址
+     */
+    'sourceVideoLinkDomain' => env('QINIU_SOURCE_VIDEO_LINK_DOMAIN', 'https://video-native.zvyhjkx.com')
 ];

modules/Video/Http/Controllers/EpisodeController.php

@@ -39,7 +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 = config('common.qiniu.publicVideoLinkDomain') . DIRECTORY_SEPARATOR . $series->video_key;
-            $series->download_video_url = config('common.qiniu.downloadVideoLinkDomain') . DIRECTORY_SEPARATOR .
+            $series->download_video_url = config('common.qiniu.sourceVideoLinkDomain') . DIRECTORY_SEPARATOR .
                 $series->video_key.'?attname='.urlencode($series->series_name).'.mp4';
         }