From b879ed69d6736b4ffd593f60401116a73a78488e Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Sat, 18 Jan 2025 17:54:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/v1/Images.php | 49 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/app/admin/controller/v1/Images.php b/app/admin/controller/v1/Images.php index a870f315..3ba77905 100644 --- a/app/admin/controller/v1/Images.php +++ b/app/admin/controller/v1/Images.php @@ -34,37 +34,38 @@ class Images $filemd5 = $file->md5(); $filesha1 = $file->sha1(); - $filename = Filesystem::disk('public')->putFile('images', $file); - - $image_manager = new ImageManager(new \Intervention\Image\Drivers\Gd\Driver()); - $image = $image_manager->read('.' . $storage . '/' . $filename); - $image->scale(200, 200); - - $idx = strrpos($filename, '.'); - $thumb_filename = mb_substr($filename, 0, $idx) . '_thumb.' . mb_substr($filename, $idx + 1); - $image->save('./storage/' . $thumb_filename); $image_model = ImageModel::md5($filemd5)->find(); if (is_null($image_model)) { + $filename = Filesystem::disk('public')->putFile('images', $file); + // / 生成缩略图 + $image_manager = new ImageManager(new \Intervention\Image\Drivers\Gd\Driver()); + $image = $image_manager->read('.' . $storage . '/' . $filename); + $image->scale(200, 200); + $idx = strrpos($filename, '.'); + $thumb_filename = mb_substr($filename, 0, $idx) . '_thumb.' . mb_substr($filename, $idx + 1); + $image->save('./storage/' . $thumb_filename); + + // 保存图片 $image_model = new ImageModel(); - } - $image_model->language_id = request()->lang_id; - $image_model->module = $param['module']; - $image_model->image_path = $filename; - $image_model->image_thumb = $thumb_filename; - $image_model->image_size = $file->getSize(); - $image_model->image_type = $file->getOriginalMime(); - $image_model->image_md5 = $filemd5; - $image_model->image_sha1 = $filesha1; - if (!$image_model->save()) { - return error('上传失败'); + $image_model->language_id = request()->lang_id; + $image_model->module = $param['module']; + $image_model->image_path = $filename; + $image_model->image_thumb = $thumb_filename; + $image_model->image_size = $file->getSize(); + $image_model->image_type = $file->getOriginalMime(); + $image_model->image_md5 = $filemd5; + $image_model->image_sha1 = $filesha1; + if (!$image_model->save()) { + return error('上传失败'); + } } return success('操作成功', [ - 'url' => $storage .'/' . $filename, - 'thumb_url' => $storage .'/' . $thumb_filename, - 'filemd5' => $filemd5, - 'filesha1' => $filesha1 + 'url' => $storage . '/' . $image_model->image_path, + 'thumb_url' => $storage . '/' . $image_model->image_thumb, + 'filemd5' => $image_model->image_md5, + 'filesha1' => $image_model->image_sha1 ]); } catch (\Throwable $th) { return error($th->getMessage());