Merge branch 'test'

src/Tools/Drawer.php

@@ -40,6 +40,7 @@ class Drawer
     }
 
     /**
+     * 下载网络图片
      * @param string $url
      * @param string $path
      * @return string
@@ -81,10 +82,19 @@ class Drawer
             $url = str_replace("%2F", "/", $url);
             $url = str_replace("%3F", "?", $url);
             $url = str_replace("%3D", "=", $url);
+            $url = str_replace("%26", "&", $url);
         }
-        return $url;
+        return $this->handleOssUrl($url);
     }
 
+    // 替换阿里云图片内部地址
+    private function handleOssUrl($url)
+    {
+        if ($this->config->get('app_env') !== 'dev') {
+            $url = str_replace('oss-cn-hangzhou.aliyuncs.com', 'oss-accelerate.aliyuncs.com', $url);
+        }
+        return $url;
+    }
 
     /**
      * description:下载文件到服务端 增加判断是否是webp 格式的图片处理