mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2026-11-17 17:13:34 +08:00
feat(存储): 同步 MinIO 配置与浏览器直传支持
背景与目的:已安装的 Library 6.1.103 提供 MinIO 驱动,应用需补齐存储配置页面和后台上传交互。 主要改动:新增 MinIO 配置模板;普通文件由 state 返回单键授权字段,浏览器按字段构建上传表单;安全文件转用本地存储并记录实际存储类型。 影响范围与兼容性:沿用上传状态、文件记录和完成接口,其他存储分支保持原行为;MinIO 直传依赖管理员配置存储桶访问及跨域策略。 验证入口及实际结果:当前文件与开发仓库对应组件一致;临时内存应用加载本项目代码,MinIO 配置页及上传脚本渲染 2/2 通过,确认当前依赖注册 MinIO 驱动。PHP 与 JavaScript 语法、差异检查通过;本次未连接真实 MinIO,也未运行浏览器上传或 CORS 验收。
This commit is contained in:
parent
d874d1baa7
commit
d5d7ecdeef
@ -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);
|
||||
|
||||
@ -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'];
|
||||
|
||||
66
app/admin/view/config/storage-minio.html
Normal file
66
app/admin/view/config/storage-minio.html
Normal file
@ -0,0 +1,66 @@
|
||||
<form action="{:sysuri()}" method="post" data-auto="true" class="layui-form layui-card">
|
||||
<div class="layui-card-body padding-top-20">
|
||||
<div class="color-text layui-code text-center layui-bg-gray" style="border-left-width:1px;margin:0 0 15px 40px">
|
||||
<p class="margin-bottom-5 font-w7">普通文件上传至 MinIO,安全文件仍存入本地安全目录</p>
|
||||
<p>请预先创建存储桶,为普通文件配置只读访问,并允许本站来源的 POST 跨域上传;不要开放匿名写入或删除</p>
|
||||
</div>
|
||||
|
||||
{include file='config/storage-0'}
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label label-required"><b class="color-green">访问协议</b><br><span class="nowrap color-desc">Protocol</span></label>
|
||||
<div class="layui-input-block">
|
||||
<select name="storage.minio_http_protocol" class="layui-select">
|
||||
<option value="https" {if sysconf('storage.minio_http_protocol') neq 'http'}selected{/if}>HTTPS</option>
|
||||
<option value="http" {if sysconf('storage.minio_http_protocol') eq 'http'}selected{/if}>HTTP</option>
|
||||
</select>
|
||||
<p class="help-block">HTTPS 会验证证书;协议应与 S3 API 端点一致</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label label-required" for="storage.minio_http_domain"><b class="color-green">API 地址</b><br><span class="nowrap color-desc">Endpoint</span></label>
|
||||
<div class="layui-input-block">
|
||||
<input id="storage.minio_http_domain" name="storage.minio_http_domain" value="{:sysconf('storage.minio_http_domain')}" required placeholder="例如 s3.example.com:9000" class="layui-input">
|
||||
<p class="help-block">填写 PHP 服务端和浏览器均可访问的 S3 域名及可选端口,不含协议、桶名或路径;不是 Console 管理地址</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label label-required" for="storage.minio_bucket"><b class="color-green">空间名称</b><br><span class="nowrap color-desc">Bucket</span></label>
|
||||
<div class="layui-input-block">
|
||||
<input id="storage.minio_bucket" name="storage.minio_bucket" value="{:sysconf('storage.minio_bucket')}" required placeholder="请输入已创建的存储桶名称" class="layui-input">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label" for="storage.minio_region"><b class="color-green">存储区域</b><br><span class="nowrap color-desc">Region</span></label>
|
||||
<div class="layui-input-block">
|
||||
<input id="storage.minio_region" name="storage.minio_region" value="{:sysconf('storage.minio_region')}" placeholder="未配置时使用 us-east-1" class="layui-input">
|
||||
<p class="help-block">必须与 MinIO 部署区域一致</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label label-required" for="storage.minio_access_key"><b class="color-green">访问密钥</b><br><span class="nowrap color-desc">AccessKey</span></label>
|
||||
<div class="layui-input-block">
|
||||
<input id="storage.minio_access_key" name="storage.minio_access_key" value="{:sysconf('storage.minio_access_key')}" required autocomplete="off" class="layui-input">
|
||||
<p class="help-block">使用仅授权目标桶对象读写、查询和删除的访问密钥</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label label-required" for="storage.minio_secret_key"><b class="color-green">安全密钥</b><br><span class="nowrap color-desc">SecretKey</span></label>
|
||||
<div class="layui-input-block">
|
||||
<input id="storage.minio_secret_key" type="password" name="storage.minio_secret_key" value="{:sysconf('storage.minio_secret_key')}" required autocomplete="new-password" class="layui-input">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="hr-line-dashed margin-left-40"></div>
|
||||
<input type="hidden" name="storage.type" value="minio">
|
||||
<div class="layui-form-item text-center padding-left-40">
|
||||
<button class="layui-btn" type="submit">保存配置</button>
|
||||
<button class="layui-btn layui-btn-danger" type="button" data-confirm="确定要取消修改吗?" data-close>取消修改</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
Loading…
x
Reference in New Issue
Block a user