Commit 81386d4e authored by 王源's avatar 王源 🎧

修复下载图片类大写后缀名的bug

parent 2fb62f0e
......@@ -47,7 +47,9 @@ class Drawer
public function downloadWebImage($url, $path = null)
{
// excel画图中下载图片时对图片名做urlencode处理,防止中文名不能正常画图片的bug
$filename = urlencode(pathinfo($url, PATHINFO_BASENAME));
$filename = urlencode(trim(pathinfo($url, PATHINFO_FILENAME)));
$ext = strtolower(pathinfo($url, PATHINFO_EXTENSION));
$filename = "$filename.$ext";
$url = $this->parseUrl($url);
$path = $this->rootPath . '/download/images/' . ($path ?: $this->savePath);
if (!is_dir($path)) {
......@@ -93,7 +95,7 @@ class Drawer
$ext = $imgPathInfo['extension']; // 图片扩展名
[$img_w, $img_h] = getimagesize($imgPath); // 图片大小
$savePath = $this->rootPath . '/download/board';
$savePath = $this->rootPath . '/download/board/' . $this->savePath;
if (!is_dir($savePath)) {
// 判断路径是否存在,不存在,则创建
mkdir($savePath, 0777, true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment