From 0d8e889a474cce7c1684803d05b9774f25df65d2 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 31 Aug 2020 11:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8E=BB=E9=99=A4=20Emoji=20?=
 =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=A4=84=E7=90=86=EF=BC=8C=E8=AF=B7=E6=8A=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BD=AC=E4=B8=BA=20utf8mb4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php                          | 2 +-
 WeChat/Contracts/MyCurlFile.php | 8 +++++---
 WeChat/Contracts/Tools.php      | 9 +++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/We.php b/We.php
index 8439aed..f582eb6 100644
--- a/We.php
+++ b/We.php
@@ -86,7 +86,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.25';
+    const VERSION = '1.2.26';
 
     /**
      * 静态配置
diff --git a/WeChat/Contracts/MyCurlFile.php b/WeChat/Contracts/MyCurlFile.php
index e81e3da..d77ca88 100644
--- a/WeChat/Contracts/MyCurlFile.php
+++ b/WeChat/Contracts/MyCurlFile.php
@@ -39,7 +39,7 @@ class MyCurlFile extends \stdClass
     }
 
     /**
-     * 获取文件信息
+     * 获取文件上传信息
      * @return \CURLFile|string
      * @throws \WeChat\Exceptions\LocalCacheException
      */
@@ -48,12 +48,14 @@ class MyCurlFile extends \stdClass
         $this->filename = Tools::pushFile($this->tempname, base64_decode($this->content));
         if (class_exists('CURLFile')) {
             return new \CURLFile($this->filename, $this->mimetype, $this->postname);
+        } else {
+            return "@{$this->tempname};filename={$this->postname};type={$this->mimetype}";
         }
-        return "@{$this->tempname};filename={$this->postname};type={$this->mimetype}";
     }
 
     /**
-     * 类销毁处理
+     * 通用销毁函数清理缓存文件
+     * 提前删除过期因此放到了网络请求之后
      */
     public function __destruct()
     {
diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 0f96b7b..69d7c4e 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -110,10 +110,11 @@ class Tools
         if (is_string($filename) && file_exists($filename)) {
             if (is_null($postname)) $postname = basename($filename);
             if (is_null($mimetype)) $mimetype = self::getExtMine(pathinfo($filename, 4));
-            if (function_exists('curl_file_create')) {
-                return curl_file_create($filename, $mimetype, $postname);
+            if (class_exists('CURLFile')) {
+                return new \CURLFile($filename, $mimetype, $postname);
+            } else {
+                return "@{$filename};filename={$postname};type={$mimetype}";
             }
-            return "@{$filename};filename={$postname};type={$mimetype}";
         }
         return $filename;
     }
@@ -182,7 +183,7 @@ class Tools
      */
     public static function arr2json($data)
     {
-        $json = json_encode(self::buildEnEmojiData($data), JSON_UNESCAPED_UNICODE);
+        $json = json_encode($data, JSON_UNESCAPED_UNICODE);
         return $json === '[]' ? '{}' : $json;
     }