Merge branch 'liuzj-permission-dev' into test

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

@@ -12,6 +12,7 @@ class CallbackController
         $qiniuConfig = config('common.qiniu');
 
         $auth = new Auth($qiniuConfig['accessKey'], $qiniuConfig['secretKey']);
+        $videoEnv = $qiniuConfig['videoEnv'];
         $expires = 7200;
         $policy  = [
             'scope' => $qiniuConfig['bucket'],
@@ -19,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/$(x:video_id)/$(etag)$(ext)',
+            'saveKey' => 'duanju/'.$videoEnv.'/$(x:video_id)/$(etag)$(ext)',
         ];
         $upToken = $auth->uploadToken($qiniuConfig['bucket'], null, $expires, $policy, true);
         return $upToken;

modules/Common/config/qiniu.php

@@ -21,4 +21,9 @@ return [
      * 下载使用的资源域名
      */
     'downloadVideoLinkDomain' => env('QINIU_DOWNLOAD_VIDEO_LINK_DOMINA', 'http://video-cdn.zvyhjkx.com'),
+    /**
+     * 视频保存的环境
+     * 1-正式,2-测试
+     */
+    'videoEnv' => env('QINIU_VIDEO_ENV', 1),
 ];

modules/CpManage/Providers/CpManageServiceProvider.php

@@ -15,7 +15,7 @@ class CpManageServiceProvider extends CatchModuleServiceProvider
      */
     protected function middlewares(): array
     {
-        return [CpManageGate::class];
+        return [];
     }
 
     /**