From adbfc34f9dd3c5e6c928c809822cc00093e12791 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Wed, 11 Jun 2025 16:51:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/v1/Upload.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/controller/v1/Upload.php b/app/admin/controller/v1/Upload.php index 8a8eeddb..5d944a09 100644 --- a/app/admin/controller/v1/Upload.php +++ b/app/admin/controller/v1/Upload.php @@ -42,7 +42,7 @@ class Upload $filemd5 = $file->md5(); $filesha1 = $file->sha1(); - $image_model = SysImageUploadRecordModel::md5($filemd5)->find(); + $image_model = null; // SysImageUploadRecordModel::md5($filemd5)->find(); if (is_null($image_model)) { $filename = Filesystem::disk('image')->putFile($param['module'], $file); // 处理图片 @@ -62,7 +62,7 @@ class Upload // 读取水印图片 $watermark_image = $image_manager->read(public_path() . $image_options['image']); // 缩放水印图片 - $watermark_image->scale((int)$image_options['width'], (int)$image_options['height']); + $watermark_image->scale($image_options['width'], $image_options['height']); // 绘制水印图片 $image->place( $watermark_image, @@ -170,8 +170,8 @@ class Upload ], 'image_options' => [ 'image' => data_get($watermark_config, 'watermark_image_value.value', ''), - 'width' => data_get($watermark_config, 'watermark_image_width.value', null), - 'height' => data_get($watermark_config, 'watermark_image_height.value', null), + 'width' => (int)data_get($watermark_config, 'watermark_image_width.value')?:null, + 'height' => (int)data_get($watermark_config, 'watermark_image_height.value')?:null, 'position' => data_get($watermark_config, 'watermark_position.value', 'top-left'), 'offset_x' => (int)data_get($watermark_config, 'watermark_offset_x.value', 0), 'offset_y' => (int)data_get($watermark_config, 'watermark_offset_y.value', 0),