一些优化

src/DcatVueServiceProvider.php

@@ -72,7 +72,7 @@ class DcatVueServiceProvider extends ServiceProvider
             return;
         }
 
-        $configs = admin_setting_array('weiwait_filesystem');
+        $configs = collect(admin_setting_array('weiwait_filesystem'));
 
 //        dd($configs);
 
@@ -81,7 +81,7 @@ class DcatVueServiceProvider extends ServiceProvider
         });
 
         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')));
         });
     }
 }

src/Helper.php

@@ -2,14 +2,13 @@
 
 namespace Weiwait\DcatVue;
 
+use Illuminate\Support\Collection;
 use QCloud\COSSTS\Sts;
 
 class Helper
 {
-    public static function injectFilesystemConfig(array $configs): void
+    public static function injectFilesystemConfig(Collection $configs): void
     {
-        $configs = collect($configs);
-
         config()->set('filesystems.disks.oss', [
             'access_key' => $configs->get('oss_access_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

version.php

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