From b85978f0a6e378da280b9dfba82daadeec64d273 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 13 Jan 2020 16:55:55 +0800 Subject: [PATCH] =?UTF-8?q?ComposerUpdate=20=E5=A2=9E=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=93=BE=E6=8E=A5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/api/Upload.php | 8 +++--- app/admin/view/api/upload.js | 2 +- app/admin/view/config/storage-0.html | 27 +++++++++++++++++++ app/admin/view/config/storage-alioss.html | 10 +------ app/admin/view/config/storage-local.html | 10 +------ app/admin/view/config/storage-qiniu.html | 10 +------ composer.lock | 8 +++--- vendor/composer/installed.json | 8 +++--- vendor/services.php | 2 +- .../zoujingli/think-library/src/Storage.php | 13 +++++---- .../src/storage/AliossStorage.php | 5 ++-- 11 files changed, 55 insertions(+), 48 deletions(-) create mode 100644 app/admin/view/config/storage-0.html diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php index ace69151f..8b81fc6b2 100644 --- a/app/admin/controller/api/Upload.php +++ b/app/admin/controller/api/Upload.php @@ -63,19 +63,19 @@ class Upload extends Controller $data['url'] = $info['url']; $this->success('文件已经上传', $data, 200); } elseif ('local' === $data['uptype']) { - $data['url'] = LocalStorage::instance()->url($data['xkey']); + $data['url'] = LocalStorage::instance()->url($data['xkey'], $this->safe, $this->name); $data['server'] = LocalStorage::instance()->upload(); } elseif ('qiniu' === $data['uptype']) { - $data['url'] = QiniuStorage::instance()->url($data['xkey']); + $data['url'] = QiniuStorage::instance()->url($data['xkey'], $this->safe, $this->name); $data['token'] = QiniuStorage::instance()->buildUploadToken($data['xkey'], 3600, $this->name); $data['server'] = QiniuStorage::instance()->upload(); } elseif ('alioss' === $data['uptype']) { - $token = AliossStorage::instance()->buildUploadToken($data['xkey']); - $data['server'] = AliossStorage::instance()->upload(); + $token = AliossStorage::instance()->buildUploadToken($data['xkey'], 3600, $this->name); $data['url'] = $token['siteurl']; $data['policy'] = $token['policy']; $data['signature'] = $token['signature']; $data['OSSAccessKeyId'] = $token['keyid']; + $data['server'] = AliossStorage::instance()->upload(); } $data['safe'] = intval($this->safe); $this->success('获取上传参数', $data, 404); diff --git a/app/admin/view/api/upload.js b/app/admin/view/api/upload.js index b495d3698..7409847a0 100644 --- a/app/admin/view/api/upload.js +++ b/app/admin/view/api/upload.js @@ -28,7 +28,7 @@ define(['md5'], function (SparkMD5, allowExtsMimes) { opt.element.data('file', file).data('index', index); jQuery.ajax("{:url('@admin/api.upload/state')}", { data: {xkey: file.xkey, uptype: opt.uptype, safe: opt.safe, name: file.name}, method: 'post', success: function (ret) { - file.xurl = ret.data.url + (ret.data.url.indexOf('?attname=') > -1 ? '' : '?attname=' + encodeURIComponent(file.name)); + file.xurl = ret.data.url; if (parseInt(ret.code) === 404) { uploader.config.url = ret.data.server; uploader.config.data.key = ret.data.xkey; diff --git a/app/admin/view/config/storage-0.html b/app/admin/view/config/storage-0.html new file mode 100644 index 000000000..a0766a950 --- /dev/null +++ b/app/admin/view/config/storage-0.html @@ -0,0 +1,27 @@ +
+ +
+ {foreach ['link_type_none'=>'简洁链接','link_type_full'=>'完整链接'] as $k=>$v} + + {/foreach} +

类型为“简洁链接”时链接将只返回 hash 地址，而“完整链接”将携带参数保留文件名称

+
+
+ +
+ +
+ +

设置系统允许上传文件的后缀，多个以英文逗号隔开如：png,jpg,rar,doc

+
+
\ No newline at end of file diff --git a/app/admin/view/config/storage-alioss.html b/app/admin/view/config/storage-alioss.html index 59b34b756..e1b9eb197 100644 --- a/app/admin/view/config/storage-alioss.html +++ b/app/admin/view/config/storage-alioss.html @@ -6,15 +6,7 @@

直传需要配置跨域规则，设置来源为 *，允许 Methods 为 POST，允许 Headers 为 *

-
- -
- -

设置系统允许上传文件的后缀，多个以英文逗号隔开如：png,jpg,rar,doc

-
-
+ {include file='config/storage-0'}
-
- -
- -

设置系统允许上传文件的后缀，多个以英文逗号隔开。如：png,jpg,rar,doc

-
-
+ {include file='config/storage-0'}
-
- -
- -

设置系统允许上传文件的后缀，多个以英文逗号隔开如：png,jpg,rar,doc

-
-
+ {include file='config/storage-0'}