From cab7a1edfc67ff0b76095c551305184a021f54b2 Mon Sep 17 00:00:00 2001 From: wolfcode <37436228+wolf-leo@users.noreply.github.com> Date: Wed, 26 Jul 2023 00:56:18 +0800 Subject: [PATCH] fix #1 --- app/admin/controller/Ajax.php | 16 +++++++++------- app/admin/service/upload/driver/Local.php | 9 +++++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/admin/controller/Ajax.php b/app/admin/controller/Ajax.php index 0fb5c52..51d6eef 100644 --- a/app/admin/controller/Ajax.php +++ b/app/admin/controller/Ajax.php @@ -77,7 +77,7 @@ class Ajax extends AdminController ->setFile($data['file']) ->save(); } catch (\Exception $e) { - $this->error($e->getMessage()); + return $this->error($e->getMessage()); } if ($upload['save'] == true) { $this->success($upload['msg'], ['url' => $upload['url']]); @@ -112,20 +112,22 @@ class Ajax extends AdminController ->setFile($data['file']) ->save(); } catch (\Exception $e) { - $this->error($e->getMessage()); + return $this->error($e->getMessage()); } if ($upload['save'] == true) { return json([ - 'error' => [ - 'message' => '上传成功', - 'number' => 201, - ], + 'error' => ['message' => '上传成功', 'number' => 201,], 'fileName' => '', 'uploaded' => 1, 'url' => $upload['url'], ]); } else { - $this->error($upload['msg']); + return json([ + 'error' => ['message' => $upload['msg'], 'number' => -1,], + 'fileName' => '', + 'uploaded' => 0, + 'url' => '', + ]); } } diff --git a/app/admin/service/upload/driver/Local.php b/app/admin/service/upload/driver/Local.php index ac3faee..fc8d49e 100644 --- a/app/admin/service/upload/driver/Local.php +++ b/app/admin/service/upload/driver/Local.php @@ -1,7 +1,5 @@ file->getOriginalName(), PATHINFO_EXTENSION) === 'php') { + return [ + 'save' => false, + 'msg' => '上传文件中存在异常文件,请重新选择', + 'url' => '', + ]; + } parent::save(); SaveDb::trigger($this->tableName, [ 'upload_type' => $this->uploadType,