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