From c3093b487f0f5de942ff560043f3d12ff8c2dbf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 9 Apr 2021 10:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=A3=80=E6=B5=8B=E5=8F=82=E6=95=B0=EF=BC=88=20xkey?=
 =?UTF-8?q?=20=E7=BB=9F=E4=B8=80=E6=94=B9=E5=90=8D=20key=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/api/Upload.php | 16 ++++++++--------
 app/admin/view/api/upload.js        |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php
index 826763807..996ea7640 100644
--- a/app/admin/controller/api/Upload.php
+++ b/app/admin/controller/api/Upload.php
@@ -62,26 +62,26 @@ class Upload extends Controller
     public function state()
     {
         [$this->name, $this->safe] = [input('name', null), $this->getSafe()];
-        $data = ['uptype' => $this->getType(), 'xkey' => input('xkey'), 'safe' => intval($this->safe)];
-        if ($info = Storage::instance($data['uptype'])->info($data['xkey'], $this->safe, $this->name)) {
+        $data = ['uptype' => $this->getType(), 'safe' => intval($this->safe), 'key' => input('key')];
+        if ($info = Storage::instance($data['uptype'])->info($data['key'], $this->safe, $this->name)) {
             $data['url'] = $info['url'];
             $this->success('文件已经上传', $data, 200);
         } elseif ('local' === $data['uptype']) {
-            $data['url'] = LocalStorage::instance()->url($data['xkey'], $this->safe, $this->name);
+            $data['url'] = LocalStorage::instance()->url($data['key'], $this->safe, $this->name);
             $data['server'] = LocalStorage::instance()->upload();
         } elseif ('qiniu' === $data['uptype']) {
-            $data['url'] = QiniuStorage::instance()->url($data['xkey'], $this->safe, $this->name);
-            $data['token'] = QiniuStorage::instance()->buildUploadToken($data['xkey'], 3600, $this->name);
+            $data['url'] = QiniuStorage::instance()->url($data['key'], $this->safe, $this->name);
+            $data['token'] = QiniuStorage::instance()->buildUploadToken($data['key'], 3600, $this->name);
             $data['server'] = QiniuStorage::instance()->upload();
         } elseif ('alioss' === $data['uptype']) {
-            $token = AliossStorage::instance()->buildUploadToken($data['xkey'], 3600, $this->name);
+            $token = AliossStorage::instance()->buildUploadToken($data['key'], 3600, $this->name);
             $data['url'] = $token['siteurl'];
             $data['policy'] = $token['policy'];
             $data['signature'] = $token['signature'];
             $data['OSSAccessKeyId'] = $token['keyid'];
             $data['server'] = AliossStorage::instance()->upload();
         } elseif ('txcos' === $data['uptype']) {
-            $token = TxcosStorage::instance()->buildUploadToken($data['xkey'], 3600, $this->name);
+            $token = TxcosStorage::instance()->buildUploadToken($data['key'], 3600, $this->name);
             $data['url'] = $token['siteurl'];
             $data['q-ak'] = $token['q-ak'];
             $data['policy'] = $token['policy'];
@@ -114,7 +114,7 @@ class Upload extends Controller
         if (in_array($this->extension, ['php', 'sh'])) {
             return json(['uploaded' => false, 'error' => ['message' => '可执行文件禁止上传到本地服务器']]);
         }
-        [$this->safe, $this->uptype, $this->name] = [$this->getSafe(), $this->getType(), input('xkey')];
+        [$this->uptype, $this->safe, $this->name] = [$this->getType(), $this->getSafe(), input('key')];
         if (empty($this->name)) $this->name = Storage::name($file->getPathname(), $this->extension, '', 'md5_file');
         if ($this->uptype === 'local') {
             $local = LocalStorage::instance();
diff --git a/app/admin/view/api/upload.js b/app/admin/view/api/upload.js
index 472038535..317e26fef 100644
--- a/app/admin/view/api/upload.js
+++ b/app/admin/view/api/upload.js
@@ -25,12 +25,11 @@ define(['md5'], function (SparkMD5, allowMime) {
                     md5file(file).then(function (file) {
                         option.element.triggerHandler('upload.hash', file);
                         jQuery.ajax("{:url('admin/api.upload/state')}", {
-                            data: {xkey: file.xkey, uptype: option.uptype, safe: option.safe, name: file.name}, method: 'post', success: function (ret) {
+                            data: {key: file.xkey, uptype: option.uptype, safe: option.safe, name: file.name}, method: 'post', success: function (ret) {
                                 if (parseInt(ret.code) === 404) {
                                     file.xurl = ret.data.url;
                                     option.uploader.config.url = ret.data.server;
-                                    option.uploader.config.data.key = ret.data.xkey;
-                                    option.uploader.config.data.xkey = ret.data.xkey;
+                                    option.uploader.config.data.key = ret.data.key;
                                     option.uploader.config.data.safe = ret.data.safe;
                                     option.uploader.config.data.uptype = ret.data.uptype;
                                     if (ret.data.uptype === 'qiniu') {