From c68bb7004ae8d0cbde1bd3f28935db673819a6c0 Mon Sep 17 00:00:00 2001
From: FeiLiao <136327134@qq.com>
Date: Thu, 18 Jan 2024 14:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/product/product/CopyTaobaoServices.php | 2 +-
 crmeb/app/services/wechat/WechatUserServices.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/product/product/CopyTaobaoServices.php b/crmeb/app/services/product/product/CopyTaobaoServices.php
index d7b6029f8..0eebc9cad 100644
--- a/crmeb/app/services/product/product/CopyTaobaoServices.php
+++ b/crmeb/app/services/product/product/CopyTaobaoServices.php
@@ -315,7 +315,7 @@ class CopyTaobaoServices extends BaseServices
                 $content = ob_get_contents();
                 ob_end_clean();
             } catch (\Exception $e) {
-                throw new AdminException($e->getMessage());
+                return '';
             }
         }
         $size = strlen(trim($content));
diff --git a/crmeb/app/services/wechat/WechatUserServices.php b/crmeb/app/services/wechat/WechatUserServices.php
index 156a22a4c..968111edc 100644
--- a/crmeb/app/services/wechat/WechatUserServices.php
+++ b/crmeb/app/services/wechat/WechatUserServices.php
@@ -247,7 +247,7 @@ class WechatUserServices extends BaseServices
 
         $wechatUserInfo = [];
         if (isset($userData['nickname']) && $userData['nickname']) $wechatUserInfo['nickname'] = filter_emoji($userData['nickname'] ?? '');//姓名
-        if (isset($userData['headimgurl']) && $userData['headimgurl']) $wechatUserInfo['headimgurl'] = $userData['avatarUrl'] ?? '';//头像
+        if (isset($userData['headimgurl']) && $userData['headimgurl']) $wechatUserInfo['headimgurl'] = $userData['headimgurl'] ?? '';//头像
         if (isset($userData['sex']) && $userData['sex']) $wechatUserInfo['sex'] = $userData['gender'] ?? '';//性别
         if (isset($userData['language']) && $userData['language']) $wechatUserInfo['language'] = $userData['language'] ?? '';//语言
         if (isset($userData['city']) && $userData['city']) $wechatUserInfo['city'] = $userData['city'] ?? '';//城市