github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-31 15:00:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修改京东云同步储存空间

Browse Source
This commit is contained in:
Gosowong 2023-06-08 19:11:51 +08:00
parent 123a918ce7
commit 02dd5044fc
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,10 +372,37 @@ class SystemStorageServices extends BaseServices
}
break;
case 5:// cos 京东云
$upload = UploadService::init($type);
$res = $upload->listbuckets();
$list = $res['Buckets'];
$location = explode('.', $res['@metadata']['effectiveUri'])[1] ?? 'cn-north-1';
$config = $this->getStorageConfig($type);
foreach ($list as $item) {
if (!$this->dao->count(['name' => $item['Name'], 'access_key' => $config['accessKey']])) {
$data[] = [
'type' => $type,
'access_key' => $config['accessKey'],
'name' => $item['Name'],
'region' => $location,
'acl' => 'public-read',
'status' => 0,
'domain' => $this->getDomain($type, $item['Name'], $location),
'is_delete' => 0,
'add_time' => time(),
'update_time' => time()
];
}
}
break;
case 6:// cos 华为云
case 7:// cos 天翼云
$upload = UploadService::init($type);
$list = $upload->listbuckets();
if (!empty($list['Name'])) {
$newList = $list;
$list = [];
$list[] = $newList;
}
$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/Jdoss.php
View File

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