From 32896c07c0399799bf1304cb1eb0166a6c282507 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Wed, 10 Aug 2022 15:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Http/Controllers/FileController.php | 25 -------------------
 beike/Admin/Routes/admin.php                  |  2 --
 .../Shop/Http/Controllers/FileController.php  | 21 ++++++++++++++++
 beike/Shop/Routes/shop.php                    |  2 ++
 4 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 100644 beike/Admin/Http/Controllers/FileController.php
 create mode 100644 beike/Shop/Http/Controllers/FileController.php

diff --git a/beike/Admin/Http/Controllers/FileController.php b/beike/Admin/Http/Controllers/FileController.php
deleted file mode 100644
index f561fe1a..00000000
--- a/beike/Admin/Http/Controllers/FileController.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Beike\Admin\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class FileController extends Controller
-{
-    public function index()
-    {
-        return view('admin::pages.file.index');
-    }
-
-    public function store(Request $request)
-    {
-        // $user = logged_admin_user();
-        $file = $request->file('file');
-        $path = $file->store('', 'upload');
-
-        return [
-            'name' => $file->getClientOriginalName(),
-            'url' => asset('upload/' . $path),
-        ];
-    }
-}
diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php
index ce2243bc..c6b8d716 100644
--- a/beike/Admin/Routes/admin.php
+++ b/beike/Admin/Routes/admin.php
@@ -49,8 +49,6 @@ Route::prefix($adminName)
                 Route::put('edit', [Controllers\EditController::class, 'update'])->name('edit');
                 Route::get('edit/locale', [Controllers\EditController::class, 'locale'])->name('edit.locale');
 
-                Route::resource('files', Controllers\FileController::class);
-
                 Route::get('file_manager', [Controllers\FileManagerController::class, 'index'])->name('file_manager.index');
                 Route::get('file_manager/files', [Controllers\FileManagerController::class, 'getFiles'])->name('file_manager.get_files');
                 Route::get('file_manager/directories', [Controllers\FileManagerController::class, 'getDirectories'])->name('file_manager.get_directories');
diff --git a/beike/Shop/Http/Controllers/FileController.php b/beike/Shop/Http/Controllers/FileController.php
new file mode 100644
index 00000000..19874411
--- /dev/null
+++ b/beike/Shop/Http/Controllers/FileController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Beike\Shop\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class FileController extends Controller
+{
+    public function store(Request $request)
+    {
+        $file = $request->file('file');
+        $type = $request->get('type');
+
+        $path = $file->store($type . '/', 'upload');
+
+        return [
+            'url' => asset('upload/' . $path),
+            'value' => 'upload/' . $path,
+        ];
+    }
+}
diff --git a/beike/Shop/Routes/shop.php b/beike/Shop/Routes/shop.php
index 7e8e5d2e..9bf8454f 100644
--- a/beike/Shop/Routes/shop.php
+++ b/beike/Shop/Routes/shop.php
@@ -4,6 +4,7 @@ use Beike\Models\Customer;
 use Beike\Shop\Http\Controllers\Account\WishlistController;
 use Beike\Shop\Http\Controllers\BrandController;
 use Beike\Shop\Http\Controllers\CurrencyController;
+use Beike\Shop\Http\Controllers\FileController;
 use Beike\Shop\Http\Controllers\LanguageController;
 use Illuminate\Support\Facades\Route;
 use Beike\Shop\Http\Controllers\ZoneController;
@@ -47,6 +48,7 @@ Route::prefix('/')
 
         Route::get('currency/{currency}', [CurrencyController::class, 'index'])->name('currency.switch');
 
+        Route::put('files', [FileController::class, 'store'])->name('file.store');
         Route::get('forgotten', [ForgottenController::class, 'index'])->name('forgotten.index');
         Route::post('forgotten/send_code', [ForgottenController::class, 'sendVerifyCode'])->name('forgotten.send_code');
         Route::post('forgotten/password', [ForgottenController::class, 'changePassword'])->name('forgotten.password');