From 174b8f3438396102e05a5581e87436a95acb969c Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Wed, 13 Jul 2022 16:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Admin/Http/Controllers/FilemanagerController.php | 2 +- beike/Admin/Services/FileManagerService.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/beike/Admin/Http/Controllers/FilemanagerController.php b/beike/Admin/Http/Controllers/FilemanagerController.php index 747f3def..73b30503 100644 --- a/beike/Admin/Http/Controllers/FilemanagerController.php +++ b/beike/Admin/Http/Controllers/FilemanagerController.php @@ -50,7 +50,7 @@ class FileManagerController extends Controller $originPath = $request->get('origin_name'); $newPath = $request->get('new_name'); (new FileManagerService)->updateName($originPath, $newPath); - return json_success('删除成功'); + return json_success('修改成功'); } diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index 524be13d..c13e34e9 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -116,10 +116,14 @@ class FileManagerService public function updateName($originPath, $newPath) { $originPath = public_path("catalog/{$originPath}"); - $newPath = public_path("catalog/{$newPath}"); if (!is_dir($originPath) || !file_exists($originPath)) { throw new \Exception('原始文件或者文件夹无效'); } + $originBase = dirname($originPath); + $newPath = $originBase . '/' . $newPath; + if ($originPath == $newPath) { + return; + } @rename($originPath, $newPath); }