diff --git a/config/admin.php b/config/admin.php
index 411d545..91f7564 100644
--- a/config/admin.php
+++ b/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',
diff --git a/config/filesystems.php b/config/filesystems.php
index f53fc7c..b6ad470 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -13,7 +13,11 @@ return [
     |
     */
 
+<<<<<<< HEAD
     'default' => env('FILESYSTEM_DRIVER', 'local'),
+=======
+    'default' => env('FILESYSTEM_DRIVER', 'oss'),
+>>>>>>> 6c3143ac16e1c248e2d2a034db764146d060894a
 
     /*
     |--------------------------------------------------------------------------
diff --git a/public/uploads/images/0cc7ad0ef1d0fe7162f3f78b7e80b0be.jpg b/public/uploads/images/0cc7ad0ef1d0fe7162f3f78b7e80b0be.jpg
new file mode 100644
index 0000000..bf24545
Binary files /dev/null and b/public/uploads/images/0cc7ad0ef1d0fe7162f3f78b7e80b0be.jpg differ
diff --git a/public/uploads/images/337bfd9633201b0e2bea6f31a15e80ca.jpg b/public/uploads/images/337bfd9633201b0e2bea6f31a15e80ca.jpg
new file mode 100644
index 0000000..cf8925f
Binary files /dev/null and b/public/uploads/images/337bfd9633201b0e2bea6f31a15e80ca.jpg differ
diff --git a/public/uploads/images/367bceacffcb308a6f39dbb681d07d06.png b/public/uploads/images/367bceacffcb308a6f39dbb681d07d06.png
new file mode 100644
index 0000000..1b1b0d1
Binary files /dev/null and b/public/uploads/images/367bceacffcb308a6f39dbb681d07d06.png differ
diff --git a/public/uploads/images/4ee024ed668216c1dcc5d9971dbee381.png b/public/uploads/images/4ee024ed668216c1dcc5d9971dbee381.png
new file mode 100644
index 0000000..1b1b0d1
Binary files /dev/null and b/public/uploads/images/4ee024ed668216c1dcc5d9971dbee381.png differ
diff --git a/public/uploads/images/580f57b7451495416ea8af9fd490cdac.jpg b/public/uploads/images/580f57b7451495416ea8af9fd490cdac.jpg
new file mode 100644
index 0000000..0cc7403
Binary files /dev/null and b/public/uploads/images/580f57b7451495416ea8af9fd490cdac.jpg differ
diff --git a/public/uploads/images/5a8c52740212b8445bd7f8260849ece3.jpg b/public/uploads/images/5a8c52740212b8445bd7f8260849ece3.jpg
new file mode 100644
index 0000000..bf24545
Binary files /dev/null and b/public/uploads/images/5a8c52740212b8445bd7f8260849ece3.jpg differ
diff --git a/public/uploads/images/9b56eac9d605940752b3aa7add348b3a.png b/public/uploads/images/9b56eac9d605940752b3aa7add348b3a.png
new file mode 100644
index 0000000..1b1b0d1
Binary files /dev/null and b/public/uploads/images/9b56eac9d605940752b3aa7add348b3a.png differ
diff --git a/public/uploads/images/a1d561930fa5d7df0fb5dcc3309fd23b.png b/public/uploads/images/a1d561930fa5d7df0fb5dcc3309fd23b.png
new file mode 100644
index 0000000..59b40a5
Binary files /dev/null and b/public/uploads/images/a1d561930fa5d7df0fb5dcc3309fd23b.png differ
diff --git a/public/uploads/images/ac7ca6949bea6a0031065a6337ae31fd.png b/public/uploads/images/ac7ca6949bea6a0031065a6337ae31fd.png
new file mode 100644
index 0000000..1b1b0d1
Binary files /dev/null and b/public/uploads/images/ac7ca6949bea6a0031065a6337ae31fd.png differ
diff --git a/public/uploads/images/d4980fef4918a6fc9bb4c8d126602418.jpg b/public/uploads/images/d4980fef4918a6fc9bb4c8d126602418.jpg
new file mode 100644
index 0000000..7c7276f
Binary files /dev/null and b/public/uploads/images/d4980fef4918a6fc9bb4c8d126602418.jpg differ
diff --git a/public/uploads/images/edd988bf5e02e728307f910e09cda125.png b/public/uploads/images/edd988bf5e02e728307f910e09cda125.png
new file mode 100644
index 0000000..59b40a5
Binary files /dev/null and b/public/uploads/images/edd988bf5e02e728307f910e09cda125.png differ