Merge branch 'liuzj-permission-dev' into test

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

@@ -18,7 +18,7 @@ class CallbackController
             'callbackBody' => '{"key":"$(key)", "avinfo":"$(avinfo)"}',
             'callbackBodyType' => 'application/json',
             'forceSaveKey' => true,
-            'saveKey' => '$(etag).$($ext)',
+            'saveKey' => '$(etag).$(ext)',
         ];
         $upToken = $auth->uploadToken($qiniuConfig['bucket'], null, $expires, $policy, true);
         return $upToken;

modules/Common/config/qiniu.php

@@ -11,6 +11,6 @@ return [
     /**
      * 资源链接域名
      */
-    'linkDomain' => env('QINIU_LINK_DOMAIN', 'http://rttaujiv7.hd-bkt.clouddn.com'),
+    'linkDomain' => env('QINIU_LINK_DOMAIN', 'http://video-cdn.zvyhjkx.com'),
     'publicLinkDomain' => env('QINIU_PUBLIC_LINK_DOMAIN', 'http://rufar0l49.hd-bkt.clouddn.com')
 ];