Merge branch 'liuzj-permission-dev' into test

modules/Common/Http/Controllers/Qiniu/CallbackController.php

@@ -19,19 +19,15 @@ class CallbackController
             'callbackBody' => '{"hash":"$(etag)","key":"$(key)", "fname":"$(fname)", "fprefix":"$(fprefix)" ,"duration":"$(avinfo.video.duration)"}',
             'callbackBodyType' => 'application/json',
             'forceSaveKey' => true,
-            'saveKey' => 'duanju/$(etag)$(ext)',
+            'saveKey' => 'duanju/$(x:video_id)/$(etag)$(ext)',
         ];
         $upToken = $auth->uploadToken($qiniuConfig['bucket'], null, $expires, $policy, true);
         return $upToken;
     }
 
-    public function downloadUrl(Request $request) {
-
-    }
-
     public function callback(Request $request) {
         $allInfo = $request->only(['duration', 'fname', 'hash', 'key', 'fprefix']);
-        $videoUrl = config('common.qiniu.linkDomain') . DIRECTORY_SEPARATOR . $allInfo['key'];
+        $videoUrl = config('common.qiniu.publicVideoLinkDomain') . DIRECTORY_SEPARATOR . $allInfo['key'];
         $publicVideoUrl = QiniuTokenService::getPrivateSourceDownloadUrl($videoUrl);
         $allInfo['public_video_url'] = $publicVideoUrl;
         $allInfo['url'] = $videoUrl;

modules/Common/config/qiniu.php

@@ -12,5 +12,9 @@ return [
      * 资源链接域名
      */
     'linkDomain' => env('QINIU_LINK_DOMAIN', 'http://video-cdn.zvyhjkx.com'),
-    'publicLinkDomain' => env('QINIU_PUBLIC_LINK_DOMAIN', 'http://rufar0l49.hd-bkt.clouddn.com')
+    'publicLinkDomain' => env('QINIU_PUBLIC_LINK_DOMAIN', 'http://rufar0l49.hd-bkt.clouddn.com'),
+    /**
+     * 公开视频资源访问
+     */
+    'publicVideoLinkDomain' => env('QINIU_PUBLIC_VIDEO_LINK_DOMAIN', 'http://video-cdn.zvyhjkx.com')
 ];