0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:更新上传获取配置

Browse Source
This commit is contained in:
JaguarJack 2020-09-07 07:44:56 +08:00
parent 214ca68b44
commit a6cebc3750
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
extend/catcher/CatchUpload.php
View File

@ -247,9 +247,19 @@ class CatchUpload
$disk = app()->config->get('filesystem.disks'); $disk = app()->config->get('filesystem.disks');
$uploadConfigs = $configModel->getConfig($upload->id); $uploadConfigs = $configModel->getConfig($upload->id);
// 重组
$_config = [];
if (!empty($uploadConfigs)) { if (!empty($uploadConfigs)) {
foreach ($uploadConfigs as $key => $value) {
list($object, $key) = explode('.', $key);
$_config[$object][$key] = $value;
}
}
if (!empty($_config)) {
// 读取上传可配置数据 // 读取上传可配置数据
foreach ($uploadConfigs as $key => &$config) { foreach ($_config as $key => &$config) {
// $disk[$key]['type'] = $key; // $disk[$key]['type'] = $key;
// 腾讯云配置处理 // 腾讯云配置处理
if (strtolower($key) == 'qcloud') { if (strtolower($key) == 'qcloud') {
@ -258,21 +268,21 @@ class CatchUpload
'secretKey' => $config['secret_key'] ?? '', 'secretKey' => $config['secret_key'] ?? '',
'secretId' => $config['secret_id'] ?? '', 'secretId' => $config['secret_id'] ?? '',
]; ];
$readFromCdn = $config['read_from_cdn'] ?? false; $readFromCdn = $config['read_from_cdn'] ?? 0;
$config['read_from_cdn'] = $readFromCdn ? true : false; $config['read_from_cdn'] = intval($readFromCdn) == 1;
} }
// OSS 配置 // OSS 配置
if (strtolower($key) == 'oss') { if (strtolower($key) == 'oss') {
$isCname = $config['is_cname'] ?? false; $isCname = $config['is_cname'] ?? 0;
$config['is_cname'] = $isCname ? true : false; $config['is_cname'] = intval($isCname) == 1;
} }
} }
// 合并数组 // 合并数组
array_walk($disk, function (&$item, $key) use ($uploadConfigs) { array_walk($disk, function (&$item, $key) use ($_config) {
if (!in_array($key, ['public', 'local'])) { if (!in_array($key, ['public', 'local'])) {
if ($uploadConfigs[$key] ?? false) { if ($_config[$key] ?? false) {
foreach ($uploadConfigs[$key] as $k => $value) { foreach ($_config[$key] as $k => $value) {
$item[$k] = $value; $item[$k] = $value;
} }
} }