Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

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();

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));

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

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',
@@ -36,6 +38,7 @@ return [
         'image/x-icon',
         'image/vnd.microsoft.icon',
         'application/x-x509-ca-cert',
+        'application/x-pem-file',
     ],
     //驱动模式，此配置优先与后台配置，后台添加配置请加前缀，例如添加七牛云配置：accessKey 后台添加变量名 qiniu_accessKey
     'stores' => [