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);