Jason/dcat-vue
1
0
Fork 0
mirror of https://github.com/cjango/dcat-vue.git synced 2025-12-06 22:40:03 +08:00
Code Issues Projects Releases Wiki Activity

一些优化

Browse Source
This commit is contained in:
weiwait
2023-01-05 17:57:49 +08:00
parent 1d55b83b3b
commit 2063e2d395
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DcatVueServiceProvider.php
View File

@@ -72,7 +72,7 @@ class DcatVueServiceProvider extends ServiceProvider
return; return;
} }
$configs = admin_setting_array('weiwait_filesystem'); $configs = collect(admin_setting_array('weiwait_filesystem'));
// dd($configs); // dd($configs);
@@ -81,7 +81,7 @@ class DcatVueServiceProvider extends ServiceProvider
}); });
Event::listen('admin:booted', function () use ($configs) { Event::listen('admin:booted', function () use ($configs) {
config()->set('admin.upload.disk', $configs['disk']); config()->set('admin.upload.disk', $configs->get('disk', config('admin.upload.disk')));
}); });
} }
} }

9
src/Helper.php
View File

@@ -2,14 +2,13 @@
namespace Weiwait\DcatVue; namespace Weiwait\DcatVue;
use Illuminate\Support\Collection;
use QCloud\COSSTS\Sts; use QCloud\COSSTS\Sts;
class Helper class Helper
{ {
public static function injectFilesystemConfig(array $configs): void public static function injectFilesystemConfig(Collection $configs): void
{ {
$configs = collect($configs);
config()->set('filesystems.disks.oss', [ config()->set('filesystems.disks.oss', [
'access_key' => $configs->get('oss_access_key'), 'access_key' => $configs->get('oss_access_key'),
'secret_key' => $configs->get('oss_secret_key'), 'secret_key' => $configs->get('oss_secret_key'),
@@ -66,9 +65,9 @@ class Helper
], ],
]); ]);
config()->set('filesystems.default', $configs->get('disk')); config()->set('filesystems.default', $configs->get('disk', config('filesystems.default')));
config()->set('admin.upload.disk', $configs->get('disk')); config()->set('admin.upload.disk', $configs->get('disk', config('admin.upload.disk')));
} }
public static function getCosAuth(): array public static function getCosAuth(): array

3
version.php
View File

@@ -70,4 +70,7 @@ return [
'2.5.1' => [ '2.5.1' => [
'一些优化', '一些优化',
], ],
'2.5.2' => [
'一些优化',
],
]; ];