From c8116376ec963810e7038cd558f5782f56ecf2ea Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Thu, 30 Nov 2023 04:21:28 +0000
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=AD=BE=E5=8F=91=E7=9A=84=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?MIME=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: JerryYan <792602257@qq.com>
---
 crmeb/config/upload.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crmeb/config/upload.php b/crmeb/config/upload.php
index 864bfea63..49f542e62 100644
--- a/crmeb/config/upload.php
+++ b/crmeb/config/upload.php
@@ -36,6 +36,7 @@ return [
         'image/x-icon',
         'image/vnd.microsoft.icon',
         'application/x-x509-ca-cert',
+        'application/x-pem-file',
     ],
     //驱动模式，此配置优先与后台配置，后台添加配置请加前缀，例如添加七牛云配置：accessKey 后台添加变量名 qiniu_accessKey
     'stores' => [

From 3dd5a019220e9dd843da15553447203ea1429586 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Thu, 30 Nov 2023 04:24:58 +0000
Subject: [PATCH 2/4] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0SVG=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: JerryYan <792602257@qq.com>
---
 crmeb/config/upload.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crmeb/config/upload.php b/crmeb/config/upload.php
index 864bfea63..81451f459 100644
--- a/crmeb/config/upload.php
+++ b/crmeb/config/upload.php
@@ -15,13 +15,15 @@ return [
     //上传文件大小
     'filesize' => 2097152,
     //上传文件后缀类型
-    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key', 'xlsx', 'xls', 'txt', 'ico'],
+    'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'svg', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key', 'xlsx', 'xls', 'txt', 'ico'],
     //上传文件类型
     'fileMime' => [
         'image/jpg',
         'image/jpeg',
         'image/gif',
         'image/png',
+        'image/svg',
+        'image/svg+xml',
         'text/plain',
         'audio/mpeg',
         'video/mp4',

From cca42c6e5ca76ca63e50665fe6dfa0c352fc1789 Mon Sep 17 00:00:00 2001
From: FeiLiao <136327134@qq.com>
Date: Fri, 12 Jan 2024 18:48:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSQL=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/dao/product/product/StoreProductDao.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crmeb/app/dao/product/product/StoreProductDao.php b/crmeb/app/dao/product/product/StoreProductDao.php
index e3daf7407..6dcf5391f 100644
--- a/crmeb/app/dao/product/product/StoreProductDao.php
+++ b/crmeb/app/dao/product/product/StoreProductDao.php
@@ -126,6 +126,7 @@ class StoreProductDao extends BaseDao
                 })->field('product_id')->select();
             });
         })->when(isset($where['coupon_category_id']) && $where['coupon_category_id'] != '', function ($query) use ($where) {
+            $where['coupon_category_id'] = stringToIntArray($where['coupon_category_id']);
             $query->whereIn('id', function ($query) use ($where) {
                 $query->name('store_product_cate')->whereIn('cate_id', function ($query) use ($where) {
                     $query->name('store_category')->whereIn('pid', $where['coupon_category_id'])->field('id')->select();

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 4/4] =?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'] ?? '';//城市