From 521a35a0a0fa2bcee9d11ed68a0d52cddb4acecf Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 12 Apr 2023 14:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=90=AF=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/upload/storage/Local.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/crmeb/services/upload/storage/Local.php b/crmeb/crmeb/services/upload/storage/Local.php
index 460fc1939..dc690c81c 100644
--- a/crmeb/crmeb/services/upload/storage/Local.php
+++ b/crmeb/crmeb/services/upload/storage/Local.php
@@ -313,7 +313,7 @@ class Local extends BaseUpload
         $savePath = public_path() . $filePath;
         try {
             $Image = Image::open(app()->getRootPath() . 'public' . $filePath);
-            $Image->water($watermark_image, $waterConfig['watermark_position'] ?: 1, $waterConfig['watermark_opacity'])->save($savePath);
+            $Image->water($watermark_image, $waterConfig['watermark_position'] ?: 1, (int)$waterConfig['watermark_opacity'])->save($savePath);
         } catch (\Throwable $e) {
             throw new AdminException($e->getMessage());
         }
@@ -344,7 +344,7 @@ class Local extends BaseUpload
             if (strlen($waterConfig['watermark_text_color']) > 7) {
                 $waterConfig['watermark_text_color'] = substr($waterConfig['watermark_text_color'], 0, 7);
             }
-            $Image->text($waterConfig['watermark_text'], $waterConfig['watermark_text_font'], $waterConfig['watermark_text_size'], $waterConfig['watermark_text_color'], $waterConfig['watermark_position'], [$waterConfig['watermark_x'], $waterConfig['watermark_y'], $waterConfig['watermark_text_angle']])->save($savePath);
+            $Image->text($waterConfig['watermark_text'], $waterConfig['watermark_text_font'], (float)$waterConfig['watermark_text_size'], $waterConfig['watermark_text_color'], $waterConfig['watermark_position'], [$waterConfig['watermark_x'], $waterConfig['watermark_y'], $waterConfig['watermark_text_angle']])->save($savePath);
         } catch (\Throwable $e) {
             throw new AdminException($e->getMessage() . $e->getLine());
         }