Commit 5700a53b authored by 王源's avatar 王源 🎧

Merge branch 'master' into test

parents 20e67dc8 f76884f1
......@@ -46,7 +46,8 @@ class Drawer
*/
public function downloadWebImage($url, $path = null)
{
$filename = pathinfo($url, PATHINFO_BASENAME);
// excel画图中下载图片时对图片名做urlencode处理,防止中文名不能正常画图片的bug
$filename = urlencode(pathinfo($url, PATHINFO_BASENAME));
$url = $this->parseUrl($url);
$path = $this->rootPath . '/download/images/' . ($path ?: $this->savePath);
if (!is_dir($path)) {
......
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