From 6ea7503387968c12fe77e0036c9ecb665d980d92 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Sun, 25 Apr 2021 14:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9C=E7=A8=8B=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=96=87=E4=BB=B6=E6=9C=89=E6=BC=8F=E6=B4=9E=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/admin/controller/store/CopyTaobao.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/crmeb/app/admin/controller/store/CopyTaobao.php b/crmeb/app/admin/controller/store/CopyTaobao.php
index 50144c519..97ecf8207 100644
--- a/crmeb/app/admin/controller/store/CopyTaobao.php
+++ b/crmeb/app/admin/controller/store/CopyTaobao.php
@@ -124,11 +124,11 @@ class CopyTaobao extends AuthController
         $product = new Product('copy', ['account' => sys_config('sms_account'), 'secret' => sys_config('sms_token')]);
         $key = md5($link);
         $info = $cache->get($key);
-        if(!$info){
+        if (!$info) {
             $info = $product->goods($link);
-            $cache->set($key,$info,7200);
+            $cache->set($key, $info, 7200);
         }
-        $info = array_merge($this->productInfo,$info);
+        $info = array_merge($this->productInfo, $info);
         return JsonService::successful($info);
     }
 
@@ -842,14 +842,18 @@ class CopyTaobao extends AuthController
     public function downloadImage($url = '', $name = '', $type = 0, $timeout = 30, $w = 0, $h = 0)
     {
         if (!strlen(trim($url))) return '';
+
         if (!strlen(trim($name))) {
             //TODO 获取要下载的文件名称
             $downloadImageInfo = $this->getImageExtname($url);
-            if (!$this->checkExtname($url, $downloadImageInfo['ext_name'])) {
-                return JsonService::fail('文件后缀不合法');
-            }
+            $ext = $downloadImageInfo['ext_name'];
             $name = $downloadImageInfo['file_name'];
             if (!strlen(trim($name))) return '';
+        } else {
+            $ext = substr(strrchr($name, '.'), 1);
+        }
+        if (!$this->checkExtname($url, $ext)) {
+            return JsonService::fail('文件后缀不合法');
         }
         //TODO 获取远程文件所采用的方法
         if ($type) {