Merge branch 'liuzj-1000954-dev' into test

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

@@ -20,7 +20,7 @@ class CallbackController
             'callbackBody' => '{"hash":"$(etag)","key":"$(key)", "fname":"$(fname)", "fprefix":"$(fprefix)" ,"duration":"$(avinfo.video.duration)"}',
             'callbackBodyType' => 'application/json',
             'forceSaveKey' => true,
-            'saveKey' => 'duanju/'.$videoEnv.'/$(x:video_id)/$(etag)$(ext)',
+            'saveKey' => 'duanju/'.$videoEnv.'/$(x:video_id)/$(etag)-'.uniqid().'$(ext)',
         ];
         $upToken = $auth->uploadToken($qiniuConfig['bucket'], null, $expires, $policy, true);
         return $upToken;