From fee35392e92f433df79026a0052247856574ce2c Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 10 Dec 2020 11:51:34 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E8=85=BE?= =?UTF-8?q?=E8=AE=AF=E4=BA=91=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/api/Upload.php | 1 + app/admin/view/api/upload.js | 13 +++++++------ vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../think-library/src/storage/TxcosStorage.php | 6 +++--- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php index 10a725a86..e2d0eecf4 100644 --- a/app/admin/controller/api/Upload.php +++ b/app/admin/controller/api/Upload.php @@ -83,6 +83,7 @@ class Upload extends Controller $data['q-ak'] = $token['q-ak']; $data['policy'] = $token['policy']; $data['q-key-time'] = $token['q-key-time']; + $data['q-signature'] = $token['q-signature']; $data['q-sign-algorithm'] = $token['q-sign-algorithm']; $data['server'] = TxcosStorage::instance()->upload(); } diff --git a/app/admin/view/api/upload.js b/app/admin/view/api/upload.js index eadced3dc..9d3a794c0 100644 --- a/app/admin/view/api/upload.js +++ b/app/admin/view/api/upload.js @@ -34,17 +34,18 @@ define(['md5'], function (SparkMD5, allowMime) { if (ret.data.uptype === 'qiniu') { option.uploader.config.data.token = ret.data.token; } else if (ret.data.uptype === 'alioss') { - option.uploader.config.data.policy = ret.data.policy; - option.uploader.config.data.signature = ret.data.signature; - option.uploader.config.data.OSSAccessKeyId = ret.data.OSSAccessKeyId; - option.uploader.config.data.success_action_status = 200; + option.uploader.config.data['policy'] = ret.data.policy; + option.uploader.config.data['signature'] = ret.data.signature; + option.uploader.config.data['OSSAccessKeyId'] = ret.data.OSSAccessKeyId; + option.uploader.config.data['success_action_status'] = 200; option.uploader.config.data['Content-Disposition'] = 'inline;filename=' + encodeURIComponent(file.name); } else if (ret.data.uptype === 'txcos') { - option.uploader.config.data.policy = ret.data.policy; + option.uploader.config.data['policy'] = ret.data.policy; option.uploader.config.data['q-ak'] = ret.data['q-ak']; option.uploader.config.data['q-key-time'] = ret.data['q-key-time']; + option.uploader.config.data['q-signature'] = ret.data['q-signature']; option.uploader.config.data['q-sign-algorithm'] = ret.data['q-sign-algorithm']; - option.uploader.config.data.success_action_status = 200; + option.uploader.config.data['success_action_status'] = 200; option.uploader.config.data['Content-Disposition'] = 'inline;filename=' + encodeURIComponent(file.name); } object.upload(file.index, file); diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 9df3e4f2c..1f446b54f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -937,12 +937,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "6f2b994b642a808ae10c1502edb8e5e92b2fff27" + "reference": "a8a7d6568b7ce7fe43c4ee7920a0b2d352e58b4c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6f2b994b642a808ae10c1502edb8e5e92b2fff27", - "reference": "6f2b994b642a808ae10c1502edb8e5e92b2fff27", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a8a7d6568b7ce7fe43c4ee7920a0b2d352e58b4c", + "reference": "a8a7d6568b7ce7fe43c4ee7920a0b2d352e58b4c", "shasum": "", "mirrors": [ { @@ -959,7 +959,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-11-30T06:08:44+00:00", + "time": "2020-12-10T03:45:59+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 14a48d30b..3703c1368 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/storage/TxcosStorage.php b/vendor/zoujingli/think-library/src/storage/TxcosStorage.php index 3fb2e4155..45204866f 100644 --- a/vendor/zoujingli/think-library/src/storage/TxcosStorage.php +++ b/vendor/zoujingli/think-library/src/storage/TxcosStorage.php @@ -205,9 +205,9 @@ class TxcosStorage extends Storage 'conditions' => [['q-ak' => $this->secretId], ['q-sign-time' => $keyTime], ['q-sign-algorithm' => 'sha1']], ]); return [ - 'policy' => base64_encode($policy), 'q-ak' => $this->secretId, - 'siteurl' => $siteurl, 'q-key-time' => $keyTime, 'q-sign-algorithm' => 'sha1', - // 'q-signature' => hash_hmac('sha1', sha1($policy), hash_hmac('sha1', $keyTime, $this->secretKey)), + 'policy' => base64_encode($policy), 'q-ak' => $this->secretId, + 'siteurl' => $siteurl, 'q-key-time' => $keyTime, 'q-sign-algorithm' => 'sha1', + 'q-signature' => hash_hmac('sha1', sha1($policy), hash_hmac('sha1', $keyTime, $this->secretKey)), ]; }