diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php index a1703b98e..219651e03 100644 --- a/app/admin/controller/api/Upload.php +++ b/app/admin/controller/api/Upload.php @@ -29,6 +29,7 @@ use think\admin\Storage; use think\admin\storage\AliossStorage; use think\admin\storage\AlistStorage; use think\admin\storage\LocalStorage; +use think\admin\storage\MinioStorage; use think\admin\storage\QiniuStorage; use think\admin\storage\TxcosStorage; use think\admin\storage\UpyunStorage; @@ -91,7 +92,7 @@ class Upload extends Controller } /** - * 文件上传检查. + * 文件上传检查;MinIO 普通文件签发单键授权,安全文件沿用本地安全目录. */ public function state() { @@ -100,9 +101,12 @@ class Upload extends Controller [$name, $safe] = [input('name'), $this->getSafe()]; $key = input('key', ''); $data = ['uptype' => $this->getType(), 'safe' => intval($safe), 'key' => is_string($key) ? $key : '']; + if ($safe && $data['uptype'] === 'minio') { + $data['uptype'] = 'local'; + } $file = SystemFile::mk()->data($this->_vali([ 'xkey.value' => $data['key'], - 'type.value' => $this->getType(), + 'type.value' => $data['uptype'], 'uuid.value' => $uuid, 'unid.value' => $unid, 'name.require' => '名称不能为空!', @@ -133,6 +137,12 @@ class Upload extends Controller $local = LocalStorage::instance(); $data['url'] = $local->url($data['key'], $safe, $name); $data['server'] = $local->upload(); + } elseif ($data['uptype'] === 'minio') { + $minio = MinioStorage::instance(); + $token = $minio->token($data['key'], 3600, $name); + $data['url'] = $token['siteurl']; + $data['fields'] = $token['fields']; + $data['server'] = $minio->upload(); } elseif ($data['uptype'] === 'qiniu') { $qiniu = QiniuStorage::instance(); $data['url'] = $qiniu->url($data['key'], $safe, $name); diff --git a/app/admin/view/api/upload.js b/app/admin/view/api/upload.js index 5a9216764..6df64b1fa 100644 --- a/app/admin/view/api/upload.js +++ b/app/admin/view/api/upload.js @@ -174,6 +174,12 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) { uploader.form.append('uptype', ret.data.uptype); if (ret.data.uptype === 'qiniu') { uploader.form.append('token', ret.data.token); + } else if (ret.data.uptype === 'minio') { + // S3 policy 校验所有表单字段,不发送本地上传的 safe、uptype。 + uploader.form = new FormData(); + Object.keys(ret.data.fields).forEach(function (name) { + uploader.form.append(name, ret.data.fields[name]); + }); } else if (ret.data.uptype === 'alist') { uploader.type = 'put'; uploader.head['file-path'] = ret.data['filepath']; diff --git a/app/admin/view/config/storage-minio.html b/app/admin/view/config/storage-minio.html new file mode 100644 index 000000000..f977f962a --- /dev/null +++ b/app/admin/view/config/storage-minio.html @@ -0,0 +1,66 @@ +
+
+
+

普通文件上传至 MinIO,安全文件仍存入本地安全目录

+

请预先创建存储桶,为普通文件配置只读访问,并允许本站来源的 POST 跨域上传;不要开放匿名写入或删除

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

HTTPS 会验证证书;协议应与 S3 API 端点一致

+
+
+ +
+ +
+ +

填写 PHP 服务端和浏览器均可访问的 S3 域名及可选端口,不含协议、桶名或路径;不是 Console 管理地址

+
+
+ +
+ +
+ +
+
+ +
+ +
+ +

必须与 MinIO 部署区域一致

+
+
+ +
+ +
+ +

使用仅授权目标桶对象读写、查询和删除的访问密钥

+
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+