github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-11-07 18:30:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

Browse Source
This commit is contained in:
liaofei 2023-05-17 10:00:48 +08:00
commit 62f821670c
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crmeb/app/services/system/config/SystemStorageServices.php
View File

@ -314,12 +314,7 @@ class SystemStorageServices extends BaseServices
break;
case 4:// cos 腾讯云
$upload = UploadService::init($type);
$cosList = $upload->listbuckets();
if (isset($cosList['Name'])) {
$list[] = $cosList;
} else {
$list = $cosList;
}
$list = $upload->listbuckets();
$config = $this->getStorageConfig($type);
foreach ($list as $item) {
if (!$this->dao->count(['name' => $item['Name'], 'access_key' => $config['accessKey']])) {

2
crmeb/crmeb/services/upload/storage/Cos.php
View File

@ -380,7 +380,7 @@ class Cos extends BaseUpload
{
try {
$res = $this->app()->listBuckets();
return $res->toArray()['Buckets'] ?? [];
return $res['Buckets']['Bucket'] ?? [];
} catch (\Throwable $e) {
return [];
}