Merge branch 'liuzj-permission-dev' into test

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

@@ -16,7 +16,7 @@ class CallbackController
         $policy  = [
             'scope' => $qiniuConfig['bucket'],
             'callbackUrl' => config('common.common.duanjuManageDomain') . '/api/qiniu/upload/callback',
-            'callbackBody' => '{"hash":"$(etag)","key":"$(key)", "fname":"$(fname)" ,"duration":"$(avinfo.video.duration)"}',
+            'callbackBody' => '{"hash":"$(etag)","key":"$(key)", "fname":"$(fname)", "fprefix":"$(fprefix)" ,"duration":"$(avinfo.video.duration)"}',
             'callbackBodyType' => 'application/json',
             'forceSaveKey' => true,
             'saveKey' => 'duanju/$(etag)$(ext)',
@@ -30,9 +30,12 @@ class CallbackController
     }
 
     public function callback(Request $request) {
-        $allInfo = $request->only(['duration', 'fname', 'hash', 'key']);
-        $videoUrl = QiniuTokenService::getPrivateSourceDownloadUrl(config('common.qiniu.linkDomain') . DIRECTORY_SEPARATOR . $allInfo['key']);
-        $allInfo['public_video_url'] = $videoUrl;
+        $allInfo = $request->only(['duration', 'fname', 'hash', 'key', 'fprefix']);
+        $videoUrl = config('common.qiniu.linkDomain') . DIRECTORY_SEPARATOR . $allInfo['key'];
+        $publicVideoUrl = QiniuTokenService::getPrivateSourceDownloadUrl($videoUrl);
+        $allInfo['public_video_url'] = $publicVideoUrl;
+        $allInfo['url'] = $videoUrl;
+        $allInfo['name'] = $allInfo['fprefix'];
 
         return $allInfo;
     }