Skip to content

新增：s3支持minio #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trainliang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

新增：s3支持minio #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 48 additions & 24 deletions application/admin/view/extend/upload/s3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,50 @@
<div class="layui-form-item upload_mode mode_S3" {if condition="$config['upload']['mode'] neq 'S3'"}style="display:none;" {/if}>
<label class="layui-form-label">S3：</label>
<div class="layui-input-block">
<a href="https://aws.amazon.com/cn/s3" target="_blank" class="layui-btn layui-btn-primary">点击申请 https://aws.amazon.com/cn/s3</a>
</div>
<div class="layui-form-mid layui-word-aux">{:lang('admin/system/configupload/s3_info')} <a href="https://github.com/aws/aws-sdk-php/releases/tag/3.334.6" target="_blank"
class="layui-btn layui-btn-primary">{:lang('down')}</a>{:lang('admin/system/configupload/s3_save_path')}:extend/aws/src/Aws/aws.phar</div>
</div>
<div class="layui-form-item upload_mode mode_S3" {if condition="$config['upload']['mode'] neq 'S3'"}style="display:none;" {/if}>
<label class="layui-form-label">Bucket：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][bucket]" placeholder="S3-bucket" value="{$config['upload']['api']['s3']['bucket']}" class="layui-input" >
</div>
<label class="layui-form-label">Access key ID：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][accesskey]" placeholder="S3-Access Key" value="{$config['upload']['api']['s3']['accesskey']}" class="layui-input" >
</div>
<label class="layui-form-label">Secret access key：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][secretkey]" placeholder="S3-Secret Key" value="{$config['upload']['api']['s3']['secretkey']}" class="layui-input" >
</div>
<label class="layui-form-label">Region：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][region]" placeholder="S3-Region" value="{$config['upload']['api']['s3']['region']}" class="layui-input" >
<div class="layui-form-item upload_mode mode_S3" {if condition="$config['upload']['mode'] neq 'S3'"
}style="display:none;" {/if}>
<label class="layui-form-label">S3：</label>
<div class="layui-input-block">
<a href="https://aws.amazon.com/cn/s3" target="_blank" class="layui-btn layui-btn-primary">点击申请
https://aws.amazon.com/cn/s3</a>
</div>
<div class="layui-form-mid layui-word-aux">{:lang('admin/system/configupload/s3_info')} <a
href="https://github.com/aws/aws-sdk-php/releases/tag/3.334.6" target="_blank"
class="layui-btn layui-btn-primary">{:lang('down')}</a>{:lang('admin/system/configupload/s3_save_path')}:extend/aws/src/Aws/aws.phar
</div>
</div>
<div class="layui-form-item upload_mode mode_S3" {if condition="$config['upload']['mode'] neq 'S3'"
}style="display:none;" {/if}>
<label class="layui-form-label">Bucket：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][bucket]" placeholder="S3-bucket"
value="{$config['upload']['api']['s3']['bucket']}" class="layui-input">
</div>
<label class="layui-form-label">Access key ID：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][accesskey]" placeholder="S3-Access Key"
value="{$config['upload']['api']['s3']['accesskey']}" class="layui-input">
</div>
<label class="layui-form-label">Secret access key：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][secretkey]" placeholder="S3-Secret Key"
value="{$config['upload']['api']['s3']['secretkey']}" class="layui-input">
</div>
<label class="layui-form-label">Region：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][region]" placeholder="S3-Region"
value="{$config['upload']['api']['s3']['region']}" class="layui-input">
</div>
<label class="layui-form-label">Endpoint：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][endpoint]" placeholder="S3-endpoint"
value="{$config['upload']['api']['s3']['endpoint']}" class="layui-input">
</div>
<label class="layui-form-label">Basepath：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][basepath]" placeholder="S3-basepath"
value="{$config['upload']['api']['s3']['basepath']}" class="layui-input">
</div>
<label class="layui-form-label">Domain：</label>
<div class="layui-input-inline w200">
<input type="text" name="upload[api][s3][domain]" placeholder="S3-open-domain"
value="{$config['upload']['api']['s3']['domain']}" class="layui-input">
</div>
</div>
11 changes: 9 additions & 2 deletions application/common/extend/upload/S3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,16 @@ public function submit($file_path)
$accessKey = $GLOBALS['config']['upload']['api']['s3']['accesskey'];
$secretKey = $GLOBALS['config']['upload']['api']['s3']['secretkey'];
$region = $GLOBALS['config']['upload']['api']['s3']['region'];
$endpoint = $GLOBALS['config']['upload']['api']['s3']['endpoint'];
$basepath = $GLOBALS['config']['upload']['api']['s3']['basepath'];
$domain = $GLOBALS['config']['upload']['api']['s3']['domain'];

require_once ROOT_PATH . 'extend/aws/autoload.php';
$s3 = new S3Client([
'region' => $region,
'version' => '2006-03-01',
'endpoint' => $endpoint,
'use_path_style_endpoint' => true,
'credentials' => [
'key' => $accessKey,
'secret' => $secretKey
Expand All @@ -34,7 +39,7 @@ public function submit($file_path)
$filePath = ROOT_PATH . $file_path;
$result = $s3->putObject([
'Bucket' => $bucket,
'Key' => $file_path,
'Key' => $basepath . $file_path,
'Body' => fopen($filePath, 'r'),
'ACL' => 'public-read'
]);
Expand All @@ -43,6 +48,8 @@ public function submit($file_path)
}

empty($this->config['keep_local']) && @unlink($filePath);
return $result['ObjectURL'];
// return $result['ObjectURL'];
// echo $result;
return $domain . $bucket . "/" . $basepath . $file_path;
}
}