水印合成跳过 gif、ico 格式图片

2022-03-18 09:14:17 +08:00
parent 659afb6a50
commit 3b1d566973
1 changed files with 2 additions and 2 deletions
@@ -154,8 +154,8 @@ class Controller extends BaseController
                $contents = Cache::get($cacheKey);
            } else {
                $contents = $image->filesystem()->read($image->pathname);
-                // 是否启用了水印功能，跳过gif图片
-                if ($image->group?->configs->get(GroupConfigKey::IsEnableWatermark) && $image->mimetype !== 'image/gif') {
+                // 是否启用了水印功能，跳过gif和ico图片
+                if ($image->group?->configs->get(GroupConfigKey::IsEnableWatermark) && ! in_array($image->extension, ['ico', 'gif'])) {
                    $configs = $image->group?->configs->get(GroupConfigKey::WatermarkConfigs);
                    $contents = $service->stickWatermark($contents, collect($configs))->encode()->getEncoded();
                }