From 7c274497aaf38aabd45c2467f5bb6e836f06e777 Mon Sep 17 00:00:00 2001 From: make Date: Sat, 10 Jan 2026 20:20:09 +0800 Subject: [PATCH] deg --- code/app/common/helper/SiteStyle.php | 26 ++++++++++++-------------- doc/Install.md | 1 + 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/code/app/common/helper/SiteStyle.php b/code/app/common/helper/SiteStyle.php index b501fe8..c91c9f2 100644 --- a/code/app/common/helper/SiteStyle.php +++ b/code/app/common/helper/SiteStyle.php @@ -2669,20 +2669,18 @@ class SiteStyle // 持久化 svg(便于排查、也便于后续升级) @file_put_contents($svgFile, $svg); - // 转 ico(16 / 32) - $bin = 'magick'; - if (!shell_exec('which magick')) { - $bin = 'convert'; - } - - $cmd = sprintf( - '%s %s -background none -define icon:auto-resize=16,32 %s', - $bin, - escapeshellarg($svgFile), - escapeshellarg($icoFile) - ); - - @exec($cmd); + // 转 ico(16 / 32)目前不使用ico + // $bin = 'magick'; + // if (!shell_exec('which magick')) { + // $bin = 'convert'; + // } + // $cmd = sprintf( + // '%s %s -background none -define icon:auto-resize=16,32 %s', + // $bin, + // escapeshellarg($svgFile), + // escapeshellarg($icoFile) + // ); + // @exec($cmd); return $strTmpSvgDir; } diff --git a/doc/Install.md b/doc/Install.md index 0a9deb8..908bb2d 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -20,6 +20,7 @@ location / { - 4. 上传logo 等图片到img public/statics/img/* - 5. 初始化数据库 `php think db:manage init` - 5. 初始化数据库 `php think mongo:manag migrate` +yum install ImageMagick