ouyang/lsky-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(svg): svg也需要“缩略图”，复制一份svg到本地缩略图目录，否则从远程服务器拉取可能会比较慢。 (#852)

Browse Source
This commit is contained in:
zhendery
2025-01-08 06:33:12 +08:00
committed by GitHub
parent bdd440d38f
commit effe173d9c
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Image.php
View File

@@ -240,7 +240,7 @@ class Image extends Model
public function getThumbnailPathname(): string
{
return trim(config('app.thumbnail_path'), '/')."/{$this->md5}.png";
return trim(config('app.thumbnail_path'), '/')."/{$this->md5}.". ($this->extension === 'svg' ? 'svg' : "png");
}
private function generateKey($length = 6): string

32
app/Services/ImageService.php
View File

@@ -266,10 +266,7 @@ class ImageService
}
}
// 生成缩略图，svg等格式本身体积足够小且网页原生支持(比生成的png缩略图还小)，不用生成缩略图
if(!in_array($extension, ['svg'])) {
$this->makeThumbnail($image, $file);
}
$this->makeThumbnail($image, $file);
// 上传完成后删除临时文件
unlink($file->getPathname());
@@ -560,21 +557,26 @@ class ImageService
@mkdir(dirname($pathname));
}
@ini_set('memory_limit', '512M');
// 生成缩略图，svg等格式本身体积足够小且网页原生支持(比生成的png缩略图还小)，不用生成缩略图，直接复制文件
if($image->extension ==='svg') {
copy($data->getPathname(), $pathname);
}else{
@ini_set('memory_limit', '512M');
$img = InterventionImage::make($data);
$img = InterventionImage::make($data);
$width = $w = $image->width;
$height = $h = $image->height;
$width = $w = $image->width;
$height = $h = $image->height;
if ($w > $max && $h > $max) {
$scale = min($max / $w, $max / $h);
$width = (int)($w * $scale);
$height = (int)($h * $scale);
if ($w > $max && $h > $max) {
$scale = min($max / $w, $max / $h);
$width = (int)($w * $scale);
$height = (int)($h * $scale);
}
$img->fit($width, $height, fn($constraint) => $constraint->upsize())->encode('png', 60)->save($pathname);
$img->destroy();
}
$img->fit($width, $height, fn($constraint) => $constraint->upsize())->encode('png', 60)->save($pathname);
$img->destroy();
} catch (\Throwable $e) {
Utils::e($e, '生成缩略图时出现异常');
}