Merge branch 'master' into test

src/Tools/Drawer.php

@@ -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)) {