first

config/admin.php

@@ -42,7 +42,11 @@ return [
     /*
      * Use `https`.
      */
+<<<<<<< HEAD
     'secure' => env('ADMIN_SECRET', true),
+=======
+    'secure' => true,
+>>>>>>> 6c3143ac16e1c248e2d2a034db764146d060894a
 
     /*
      * Laravel-admin auth setting.
@@ -68,7 +72,11 @@ return [
      */
     'upload' => [
 
+<<<<<<< HEAD
         'disk' => 'admin',
+=======
+        'disk' => 'oss',
+>>>>>>> 6c3143ac16e1c248e2d2a034db764146d060894a
 
         'directory' => [
             'image' => 'images',

config/filesystems.php

@@ -13,7 +13,11 @@ return [
     |
     */
 
+<<<<<<< HEAD
     'default' => env('FILESYSTEM_DRIVER', 'local'),
+=======
+    'default' => env('FILESYSTEM_DRIVER', 'oss'),
+>>>>>>> 6c3143ac16e1c248e2d2a034db764146d060894a
 
     /*
     |--------------------------------------------------------------------------