From 046d642a875a0ae5834d033489c2c1ae39ac3a47 Mon Sep 17 00:00:00 2001
From: Wisp X <wisp-x@qq.com>
Date: Wed, 19 Jan 2022 13:09:24 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B0=B4=E5=8D=B0=E8=B7=B3?=
 =?UTF-8?q?=E8=BF=87=20gif=20=E5=8A=A8=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/User/ImageController.php | 4 ++--
 app/Service/ImageService.php                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/User/ImageController.php b/app/Http/Controllers/User/ImageController.php
index 4f4f5f94..bfe23f5c 100644
--- a/app/Http/Controllers/User/ImageController.php
+++ b/app/Http/Controllers/User/ImageController.php
@@ -108,8 +108,8 @@ class ImageController extends Controller
         } catch (FilesystemException $e) {
             abort(404);
         }
-        // 是否启用了水印功能 TODO 跳过gif
-        if ($image->group->configs->get(GroupConfigKey::IsEnableWatermark)) {
+        // 是否启用了水印功能，跳过gif图片
+        if ($image->group->configs->get(GroupConfigKey::IsEnableWatermark) && $image->mimetype !== 'image/gif') {
             // TODO 缓存水印文件
             $configs = $image->group->configs->get(GroupConfigKey::WatermarkConfigs);
             $contents = (string)$service->stickWatermark($contents, collect($configs))->encode();
diff --git a/app/Service/ImageService.php b/app/Service/ImageService.php
index 724b0a3a..8e4c0b46 100644
--- a/app/Service/ImageService.php
+++ b/app/Service/ImageService.php
@@ -209,6 +209,7 @@ class ImageService
      */
     public function stickWatermark(mixed $image, Collection $configs): \Intervention\Image\Image
     {
+        // TODO 支持百分比大小
         $driver = $configs->get('driver');
         $options = collect($configs->get("drivers")[$driver]);
         $image = InterventionImage::make($image);