Commit 14e7c9fd authored by fuyunnan's avatar fuyunnan
Browse files

Merge branch 'master' into test

parents 34eebd2e f381fbb1

src/Tools/Drawer.php

+3 −2
Original line number Diff line number Diff line
@@ -107,8 +107,9 @@ class Drawer 
     */

    public function downLoadImgWebpChannel($url, $path = '')

    {

        $originUrl = $url;

        //如果shopify 去掉版本号

        if (strpos($url, 'cdn.shopify.com') !== false) {

        if (strpos($url, 'shopify') !== false) {

            $url = substr($url, 0, strpos($url, '?v='));

        }

        $savePath = $this->rootPath . '/download/images/' . ($path ? $path . '/' : $this->savePath);
@@ -120,7 +121,7 @@ class Drawer 
            $filePath = $savePath . "$filename.$ext";

            $ch = curl_init();

            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // 信任任何证书

            curl_setopt($ch, CURLOPT_URL, $url);

            curl_setopt($ch, CURLOPT_URL, $originUrl);

            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);

            $file = curl_exec($ch);