From 418e132e3e5ae5fca03df234709dad6d79c9d1f4 Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 2 Mar 2020 19:08:34 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=89=93=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AliPay/Transfer.php | 42 ++++++++++++++++++++++++++++- We.php | 2 +- _test/alipay-transfer-account.php | 37 ++++++++++++++++++++++++++ _test/alipay-transfer-create.php | 44 +++++++++++++++++++++++++++++++ _test/alipay-transfer-query.php | 38 ++++++++++++++++++++++++++ 5 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 _test/alipay-transfer-account.php create mode 100644 _test/alipay-transfer-create.php create mode 100644 _test/alipay-transfer-query.php diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php index bb745cf..607d478 100644 --- a/AliPay/Transfer.php +++ b/AliPay/Transfer.php @@ -35,7 +35,7 @@ class Transfer extends BasicAliPay } /** - * 创建数据操作 + * 旧版 向指定支付宝账户转账 * @param array $options * @return mixed * @throws \WeChat\Exceptions\InvalidResponseException @@ -45,4 +45,44 @@ class Transfer extends BasicAliPay { return $this->getResult($options); } + + /** + * 新版 向指定支付宝账户转账 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function create($options = []) + { + $this->options->set('method', 'alipay.fund.trans.uni.transfer'); + return $this->getResult($options); + } + + /** + * 新版 转账业务单据查询接口 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function queryResult($options = []) + { + $this->options->set('method', 'alipay.fund.trans.common.query'); + return $this->getResult($options); + + } + + /** + * 新版 支付宝资金账户资产查询接口 + * @param array $options + * @return array|bool + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function queryAccount($options = []) + { + $this->options->set('method', 'alipay.fund.account.query'); + return $this->getResult($options); + } } \ No newline at end of file diff --git a/We.php b/We.php index f4bb06b..a81ff1a 100644 --- a/We.php +++ b/We.php @@ -81,7 +81,7 @@ class We * 定义当前版本 * @var string */ - const VERSION = '1.2.13'; + const VERSION = '1.2.17'; /** * 静态配置 diff --git a/_test/alipay-transfer-account.php b/_test/alipay-transfer-account.php new file mode 100644 index 0000000..1d2b289 --- /dev/null +++ b/_test/alipay-transfer-account.php @@ -0,0 +1,37 @@ +queryAccount([ + 'alipay_user_id' => $config['appid'], // 订单号 + 'account_scene_code' => 'SCENE_000_000_000', + ]); + echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
diff --git a/_test/alipay-transfer-create.php b/_test/alipay-transfer-create.php
new file mode 100644
index 0000000..39d0fc4
--- /dev/null
+++ b/_test/alipay-transfer-create.php
@@ -0,0 +1,44 @@
+create([
+        'out_biz_no'   => time(), // 订单号
+        'trans_amount' => '10', // 转账金额
+        'product_code' => 'TRANS_ACCOUNT_NO_PWD',
+        'biz_scene'    => 'DIRECT_TRANSFER',
+        'payee_info'   => [
+            'identity'      => 'zoujingli@qq.com',
+            'identity_type' => 'ALIPAY_LOGON_ID',
+            'name'          => '邹景立',
+        ],
+    ]);
+    echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
diff --git a/_test/alipay-transfer-query.php b/_test/alipay-transfer-query.php
new file mode 100644
index 0000000..7e7d99f
--- /dev/null
+++ b/_test/alipay-transfer-query.php
@@ -0,0 +1,38 @@
+queryResult([
+        'out_biz_no'   => '201808080001', // 订单号
+        'product_code' => 'TRANS_ACCOUNT_NO_PWD',
+        'biz_scene'    => 'DIRECT_TRANSFER',
+    ]);
+    echo '
';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+

From 98f6e82311a364220a677cdfd56dc9f97851ab24 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Tue, 3 Mar 2020 09:38:07 +0800
Subject: [PATCH 02/31] Update Transfer.php

---
 AliPay/Transfer.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
index 607d478..46e9f21 100644
--- a/AliPay/Transfer.php
+++ b/AliPay/Transfer.php
@@ -24,16 +24,6 @@ use WeChat\Contracts\BasicAliPay;
 class Transfer extends BasicAliPay
 {
 
-    /**
-     * Transfer constructor.
-     * @param array $options
-     */
-    public function __construct(array $options)
-    {
-        parent::__construct($options);
-        $this->options->set('method', 'alipay.fund.trans.toaccount.transfer');
-    }
-
     /**
      * 旧版 向指定支付宝账户转账
      * @param array $options
@@ -43,6 +33,7 @@ class Transfer extends BasicAliPay
      */
     public function apply($options)
     {
+        $this->options->set('method', 'alipay.fund.trans.toaccount.transfer');
         return $this->getResult($options);
     }
 

From 3a24f257bafae11cc706865e371eaec7c24a9366 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 14:42:04 +0800
Subject: [PATCH 03/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=80=E5=AF=BC?=
 =?UTF-8?q?=E8=B4=AD=E5=8A=A9=E6=89=8B=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php             |   2 +-
 WeMini/Guide.php   | 547 +++++++++++++++++++++++++++++++++++++++++++++
 WeMini/Newtmpl.php |   2 +-
 3 files changed, 549 insertions(+), 2 deletions(-)
 create mode 100644 WeMini/Guide.php

diff --git a/We.php b/We.php
index a81ff1a..78dc040 100644
--- a/We.php
+++ b/We.php
@@ -81,7 +81,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.17';
+    const VERSION = '1.2.18';
 
     /**
      * 静态配置
diff --git a/WeMini/Guide.php b/WeMini/Guide.php
new file mode 100644
index 0000000..2653b45
--- /dev/null
+++ b/WeMini/Guide.php
@@ -0,0 +1,547 @@
+registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 服务号删除导购
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function delGuideAcct($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/delguideacct?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 服务号获取导购信息
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideAcct($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguideacct?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 获取服务号的敏感词信息与自动回复信息
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideAcctConfig()
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguideacctconfig?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, [], true);
+    }
+
+    /**
+     * 服务号拉取导购列表
+     * @param integer $page
+     * @param integer $num
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideAcctList($page = 0, $num = 10)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguideacctconfig?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['page' => $page, 'num' => $num], true);
+    }
+
+    /**
+     * 获取导购聊天记录
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideBuyerChatRecord($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguideacct?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 获取导购快捷回复信息
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideConfig($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguideconfig?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 生成导购二维码
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function guideCreateQrCode($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/guidecreateqrcode?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function pushShowWxaPathMenu($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/pushshowwxapathmenu?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 为服务号设置敏感词与自动回复
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function setGuideAcctConfig($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/setguideacctconfig?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 设置导购快捷回复信息
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function setGuideConfig($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/setguideconfig?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 更新导购昵称或者头像
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function updateGuideAcct($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/setguideconfig?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 添加展示标签信息
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addGuideBuyerDisplayTag($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/addguidebuyerdisplaytag?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 为粉丝添加可查询标签
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addGuideBuyerTag($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/addguidebuyertag?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 添加标签可选值
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addGuideTagOption($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/addguidetagoption?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+
+    /**
+     * 删除粉丝标签
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function delGuideBuyerTag($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/delguidebuyertag?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 查询展示标签信息
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideBuyerDisplayTag($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguidebuyerdisplaytag?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 查询粉丝标签
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideBuyerTag($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguidebuyertag?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 查询标签可选值信息
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideTagOption()
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguidetagoption?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, [], true);
+    }
+
+    /**
+     * 新建可查询标签类型,支持新建4类可查询标签
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function newGuideTagOption($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/newguidetagoption?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 根据标签值筛选粉丝
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function queryGuideBuyerByTag($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/queryguidebuyerbytag?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 为服务号导购添加粉丝
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addGuideBuyerRelation($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/addguidebuyerrelation?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 删除导购的粉丝
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function delGuideBuyerRelation($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/delguidebuyerrelation?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 查询某一个粉丝与导购的绑定关系
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideBuyerRelation($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguidebuyerrelation?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 通过粉丝信息查询该粉丝与导购的绑定关系
+     * @param string $openid
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideBuyerRelationByBuyer($openid)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguidebuyerrelation?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['openid' => $openid], true);
+    }
+
+    /**
+     * 拉取导购的粉丝列表
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideBuyerRelationList($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguidebuyerrelationlist?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 将粉丝从一个导购迁移到另外一个导购下
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function rebindGuideAcctForBuyer($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/rebindguideacctforbuyer?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 更新粉丝昵称
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function updateGuideBuyerRelation($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/updateguidebuyerrelation?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 删除小程序卡片素材
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function delGuideCardMaterial($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/delguidecardmaterial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 删除图片素材
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function delGuideImageMaterial($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/delguideimagematerial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 删除文字素材
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function delGuideWordMaterial($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/delguidewordmaterial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 获取小程序卡片素材信息
+     * @param integer $type
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideCardMaterial($type = 0)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguidecardmaterial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['type' => $type], true);
+    }
+
+    /**
+     * 获取图片素材信息
+     * @param integer $type 操作类型
+     * @param integer $start 分页查询，起始位置
+     * @param integer $num 分页查询，查询个数
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideImageMaterial($type = 0, $start = 0, $num = 10)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguideimagematerial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['type' => $type, 'start' => $start, 'num' => $num], true);
+    }
+
+    /**
+     * 获取文字素材信息
+     * @param integer $type 操作类型
+     * @param integer $start 分页查询，起始位置
+     * @param integer $num 分页查询，查询个数
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGuideWordMaterial($type = 0, $start = 0, $num = 10)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/getguidewordmaterial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['type' => $type, 'start' => $start, 'num' => $num], true);
+    }
+
+    /**
+     * 添加小程序卡片素材
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function setGuideCardMaterial($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/setguidecardmaterial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 添加图片素材
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function setGuideImageMaterial($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/setguideimagematerial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 为服务号添加文字素材
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function setGuideWordMaterial($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/guide/setguidewordmaterial?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+}
\ No newline at end of file
diff --git a/WeMini/Newtmpl.php b/WeMini/Newtmpl.php
index 80ae2ac..0bb4027 100644
--- a/WeMini/Newtmpl.php
+++ b/WeMini/Newtmpl.php
@@ -74,7 +74,7 @@ class Newtmpl extends BasicWeChat
     {
         $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatetitles?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->callPostApi($url, ['ids'=>$ids,'start' => '0', 'limit' => '30'], true);
+        return $this->callPostApi($url, ['ids' => $ids, 'start' => '0', 'limit' => '30'], true);
     }
 
     /**

From d4f1d7acda69bc5e37b36df52313fb1051acb0ca Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 14:44:23 +0800
Subject: [PATCH 04/31] Create Search.php

---
 WeMini/Search.php | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 WeMini/Search.php

diff --git a/WeMini/Search.php b/WeMini/Search.php
new file mode 100644
index 0000000..88b4fd0
--- /dev/null
+++ b/WeMini/Search.php
@@ -0,0 +1,39 @@
+registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['pages' => $pages], true);
+    }
+
+}
\ No newline at end of file

From e9f2605f922a382b9b72b65b5a000d6f1df23478 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 14:50:36 +0800
Subject: [PATCH 05/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php            | 3 +++
 WeMini/Search.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/We.php b/We.php
index 78dc040..8781024 100644
--- a/We.php
+++ b/We.php
@@ -45,13 +45,16 @@ use WeChat\Exceptions\InvalidInstanceException;
  * ----- WeMini -----
  * @method \WeMini\Crypt WeMiniCrypt($options = []) static 小程序数据加密处理
  * @method \WeMini\Delivery WeMiniDelivery($options = []) static 小程序即时配送
+ * @method \WeMini\Guide WeMiniGuide($options = []) static 小程序导购助手
  * @method \WeMini\Image WeMiniImage($options = []) static 小程序图像处理
  * @method \WeMini\Logistics WeMiniLogistics($options = []) static 小程序物流助手
  * @method \WeMini\Message WeMiniMessage($options = []) static 小程序动态消息
+ * @method \WeMini\Newtmpl WeMiniNewtmpl($options = []) static 小程序订阅消息
  * @method \WeMini\Ocr WeMiniOcr($options = []) static 小程序ORC服务
  * @method \WeMini\Plugs WeMiniPlugs($options = []) static 小程序插件管理
  * @method \WeMini\Poi WeMiniPoi($options = []) static 小程序地址管理
  * @method \WeMini\Qrcode WeMiniQrcode($options = []) static 小程序二维码管理
+ * @method \WeMini\Search WeMiniSearch($options = []) static 小程序搜索
  * @method \WeMini\Security WeMiniSecurity($options = []) static 小程序内容安全
  * @method \WeMini\Soter WeMiniSoter($options = []) static 小程序生物认证
  * @method \WeMini\Template WeMiniTemplate($options = []) static 小程序模板消息支持
diff --git a/WeMini/Search.php b/WeMini/Search.php
index 88b4fd0..92b888e 100644
--- a/WeMini/Search.php
+++ b/WeMini/Search.php
@@ -17,6 +17,7 @@ namespace WeMini;
 use WeChat\Contracts\BasicWeChat;
 
 /**
+ * 小程序搜索
  * Class Search
  * @package WeMini
  */

From 7eb32f1451ab50621cf73df6f8cf709d3f9fcf0e Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 14:53:08 +0800
Subject: [PATCH 06/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=BF=90=E7=BB=B4=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php               |  1 +
 WeMini/Operation.php | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 WeMini/Operation.php

diff --git a/We.php b/We.php
index 8781024..309a7b2 100644
--- a/We.php
+++ b/We.php
@@ -51,6 +51,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WeMini\Message WeMiniMessage($options = []) static 小程序动态消息
  * @method \WeMini\Newtmpl WeMiniNewtmpl($options = []) static 小程序订阅消息
  * @method \WeMini\Ocr WeMiniOcr($options = []) static 小程序ORC服务
+ * @method \WeMini\Operation WeMiniOperation($options = []) static 小程序运维中心
  * @method \WeMini\Plugs WeMiniPlugs($options = []) static 小程序插件管理
  * @method \WeMini\Poi WeMiniPoi($options = []) static 小程序地址管理
  * @method \WeMini\Qrcode WeMiniQrcode($options = []) static 小程序二维码管理
diff --git a/WeMini/Operation.php b/WeMini/Operation.php
new file mode 100644
index 0000000..fe0bb06
--- /dev/null
+++ b/WeMini/Operation.php
@@ -0,0 +1,41 @@
+registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+}
\ No newline at end of file

From 372c422ab9a516af02c08d7c90483f75233de0a7 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 14:58:15 +0800
Subject: [PATCH 07/31] Update We.php

---
 We.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/We.php b/We.php
index 309a7b2..fa1a08a 100644
--- a/We.php
+++ b/We.php
@@ -63,9 +63,9 @@ use WeChat\Exceptions\InvalidInstanceException;
  *
  * ----- WePay -----
  * @method \WePay\Bill WePayBill($options = []) static 微信商户账单及评论
+ * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券
  * @method \WePay\Order WePayOrder($options = []) static 微信商户订单
  * @method \WePay\Refund WePayRefund($options = []) static 微信商户退款
- * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券
  * @method \WePay\Redpack WePayRedpack($options = []) static 微信红包支持
  * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱
  * @method \WePay\TransfersBank WePayTransfersBank($options = []) static 微信商户打款到银行卡

From aaffc0a1494ebb4ce9d241e284901b2b8093e368 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 14:58:57 +0800
Subject: [PATCH 08/31] Update We.php

---
 We.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/We.php b/We.php
index fa1a08a..4afcb2d 100644
--- a/We.php
+++ b/We.php
@@ -23,6 +23,15 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @author Anyon
  * @date 2018/05/24 13:23
  *
+ * ----- AliPay ----
+ * @method \AliPay\App AliPayApp($options) static 支付宝App支付网关
+ * @method \AliPay\Bill AliPayBill($options) static 支付宝电子面单下载
+ * @method \AliPay\Pos AliPayPos($options) static 支付宝刷卡支付
+ * @method \AliPay\Scan AliPayScan($options) static 支付宝扫码支付
+ * @method \AliPay\Transfer AliPayTransfer($options) static 支付宝转账到账户
+ * @method \AliPay\Wap AliPayWap($options) static 支付宝手机网站支付
+ * @method \AliPay\Web AliPayWeb($options) static 支付宝网站支付
+ *
  * ----- WeChat -----
  * @method \WeChat\Card WeChatCard($options = []) static 微信卡券管理
  * @method \WeChat\Custom WeChatCustom($options = []) static 微信客服消息
@@ -69,15 +78,6 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WePay\Redpack WePayRedpack($options = []) static 微信红包支持
  * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱
  * @method \WePay\TransfersBank WePayTransfersBank($options = []) static 微信商户打款到银行卡
- *
- * ----- AliPay ----
- * @method \AliPay\App AliPayApp($options) static 支付宝App支付网关
- * @method \AliPay\Bill AliPayBill($options) static 支付宝电子面单下载
- * @method \AliPay\Pos AliPayPos($options) static 支付宝刷卡支付
- * @method \AliPay\Scan AliPayScan($options) static 支付宝扫码支付
- * @method \AliPay\Transfer AliPayTransfer($options) static 支付宝转账到账户
- * @method \AliPay\Wap AliPayWap($options) static 支付宝手机网站支付
- * @method \AliPay\Web AliPayWeb($options) static 支付宝网站支付
  */
 class We
 {

From 58d3ef53843494233a9bba08ca17c96e8b454cc4 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 15:00:42 +0800
Subject: [PATCH 09/31] Update include.php

---
 include.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include.php b/include.php
index e88c70e..cd3af5f 100644
--- a/include.php
+++ b/include.php
@@ -16,7 +16,7 @@ spl_autoload_register(function ($classname) {
     $pathname = __DIR__ . DIRECTORY_SEPARATOR;
     $filename = str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
     if (file_exists($pathname . $filename)) {
-        foreach (['WeChat', 'WeMini', 'AliPay', 'WePay', 'We'] as $prefix) {
+        foreach (['AliPay', 'WeChat', 'WeMini', 'WePay', 'We'] as $prefix) {
             if (stripos($classname, $prefix) === 0) {
                 include $pathname . $filename;
                 return true;

From d28fde141bde17eea23e7c440e77e374e89cd5b3 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 15:03:59 +0800
Subject: [PATCH 10/31] Update alipay-refund.php

---
 _test/alipay-refund.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_test/alipay-refund.php b/_test/alipay-refund.php
index 487ca7b..6bcdddb 100644
--- a/_test/alipay-refund.php
+++ b/_test/alipay-refund.php
@@ -31,7 +31,7 @@ try {
 
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.refund
     $result = $pay->refund($out_trade_no, $refund_fee);
-    
+
     echo '
';
     var_export($result);
 } catch (Exception $e) {

From df25396ae230cfe36b4f825f40e69a3cee948d54 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 15:05:34 +0800
Subject: [PATCH 11/31] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 529d1f4..21099e3 100644
--- a/readme.md
+++ b/readme.md
@@ -40,7 +40,7 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
 * Gitee 托管地址：https://gitee.com/zoujingli/WeChatDeveloper
 * GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
 
-文件说明
+文件说明（后缀会根据官方文档增加文件）
 ----
 
 |文件名|类名|描述|类型|加载 ①|

From 73da26babde2b1e0eeb0ffd5552d92081ac4430c Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 15:15:20 +0800
Subject: [PATCH 12/31] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d8ee7c1..d1aba0d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     {
       "name": "Anyon",
       "email": "zoujingli@qq.com",
-      "homepage": "http://ctolog.com"
+      "homepage": "https://thinkadmin.top"
     }
   ],
   "keywords": [

From a94f30edff4b25879f88bd967e47f64f6346cf9a Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Fri, 6 Mar 2020 15:15:53 +0800
Subject: [PATCH 13/31] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d1aba0d..931573b 100644
--- a/composer.json
+++ b/composer.json
@@ -34,8 +34,8 @@
     ],
     "psr-4": {
       "WePay\\": "WePay",
-      "WeMini\\": "WeMini",
       "WeChat\\": "WeChat",
+      "WeMini\\": "WeMini",
       "AliPay\\": "AliPay"
     }
   }

From 9dbabfe89e3e967579d65db66c5a8af072884348 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Wed, 11 Mar 2020 09:47:17 +0800
Subject: [PATCH 14/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/Transfer.php              | 25 ++++++++++++
 We.php                           |  2 +-
 WeChat/Contracts/BasicAliPay.php | 69 ++++++++++++++++++++++++++++++++
 _test/alipay.php                 |  4 ++
 composer.json                    |  1 +
 5 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
index 46e9f21..3ba69f1 100644
--- a/AliPay/Transfer.php
+++ b/AliPay/Transfer.php
@@ -15,6 +15,7 @@
 namespace AliPay;
 
 use WeChat\Contracts\BasicAliPay;
+use WeChat\Exceptions\InvalidArgumentException;
 
 /**
  * 支付宝转账到账户
@@ -46,6 +47,7 @@ class Transfer extends BasicAliPay
      */
     public function create($options = [])
     {
+        $this->setAppCertSnAndRootCertSn();
         $this->options->set('method', 'alipay.fund.trans.uni.transfer');
         return $this->getResult($options);
     }
@@ -59,6 +61,7 @@ class Transfer extends BasicAliPay
      */
     public function queryResult($options = [])
     {
+        $this->setAppCertSnAndRootCertSn();
         $this->options->set('method', 'alipay.fund.trans.common.query');
         return $this->getResult($options);
 
@@ -73,7 +76,29 @@ class Transfer extends BasicAliPay
      */
     public function queryAccount($options = [])
     {
+        $this->setAppCertSnAndRootCertSn();
         $this->options->set('method', 'alipay.fund.account.query');
         return $this->getResult($options);
     }
+
+    /**
+     * 新版 设置网关应用公钥证书SN、支付宝根证书SN
+     */
+    protected function setAppCertSnAndRootCertSn()
+    {
+        if (!$this->config->get('app_cert')) {
+            throw new InvalidArgumentException("Missing Config -- [app_cert]");
+        }
+        if (!$this->config->get('root_cert')) {
+            throw new InvalidArgumentException("Missing Config -- [root_cert]");
+        }
+        $this->options->set('app_cert_sn', $this->getCertSN($this->config->get('app_cert')));
+        $this->options->set('alipay_root_cert_sn', $this->getRootCertSN($this->config->get('root_cert')));
+        if (!$this->options->get('app_cert_sn')) {
+            throw new InvalidArgumentException("Missing options -- [app_cert_sn]");
+        }
+        if (!$this->options->get('alipay_root_cert_sn')) {
+            throw new InvalidArgumentException("Missing options -- [alipay_root_cert_sn]");
+        }
+    }
 }
\ No newline at end of file
diff --git a/We.php b/We.php
index 4afcb2d..83da261 100644
--- a/We.php
+++ b/We.php
@@ -85,7 +85,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.18';
+    const VERSION = '1.2.19';
 
     /**
      * 静态配置
diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index b2d320a..468b03a 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -276,6 +276,75 @@ abstract class BasicAliPay
         return "{$html}";
     }
 
+    /**
+     * 新版 从证书中提取序列号
+     * @param string $sign
+     * @return string
+     */
+    public function getCertSN($sign)
+    {
+        if (file_exists($sign)) $sign = file_get_contents($sign);
+        $ssl = openssl_x509_parse($sign);
+        return md5($this->_arr2str(array_reverse($ssl['issuer'])) . $ssl['serialNumber']);
+    }
+
+    /**
+     * 新版 提取根证书序列号
+     * @param string $sign
+     * @return string|null
+     */
+    public function getRootCertSN($sign)
+    {
+        $sn = null;
+        if (file_exists($sign)) $sign = file_get_contents($sign);
+        $array = explode("-----END CERTIFICATE-----", $sign);
+        for ($i = 0; $i < count($array) - 1; $i++) {
+            $ssl[$i] = openssl_x509_parse($array[$i] . "-----END CERTIFICATE-----");
+            if (strpos($ssl[$i]['serialNumber'], '0x') === 0) {
+                $ssl[$i]['serialNumber'] = $this->_hex2dec($ssl[$i]['serialNumber']);
+            }
+            if ($ssl[$i]['signatureTypeLN'] == "sha1WithRSAEncryption" || $ssl[$i]['signatureTypeLN'] == "sha256WithRSAEncryption") {
+                if ($sn == null) {
+                    $sn = md5($this->_arr2str(array_reverse($ssl[$i]['issuer'])) . $ssl[$i]['serialNumber']);
+                } else {
+                    $sn = $sn . "_" . md5($this->_arr2str(array_reverse($ssl[$i]['issuer'])) . $ssl[$i]['serialNumber']);
+                }
+            }
+        }
+        return $sn;
+    }
+
+    /**
+     * 新版 数组转字符串
+     * @param array $array
+     * @return string
+     */
+    private function _arr2str($array)
+    {
+        $string = [];
+        if ($array && is_array($array)) {
+            foreach ($array as $key => $value) {
+                $string[] = $key . '=' . $value;
+            }
+        }
+        return implode(',', $string);
+    }
+
+
+    /**
+     * 新版 0x转高精度数字
+     * @param string $hex
+     * @return int|string
+     */
+    private function _hex2dec($hex)
+    {
+        list($dec, $len) = [0, strlen($hex)];
+        for ($i = 1; $i <= $len; $i++) {
+            $dec = bcadd($dec, bcmul(strval(hexdec($hex[$i - 1])), bcpow('16', strval($len - $i))));
+        }
+        return $dec;
+    }
+
     /**
      * 应用数据操作
      * @param array $options
diff --git a/_test/alipay.php b/_test/alipay.php
index 25a7379..16bfe40 100644
--- a/_test/alipay.php
+++ b/_test/alipay.php
@@ -23,6 +23,10 @@ return [
     'public_key'  => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB',
     // 支付宝私钥(1行填写)
     'private_key' => 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC3pbN7esinxgjE8uxXAsccgGNKIq+PR1LteNTFOy0fsete43ObQCrzd9DO0zaUeBUzpIOnxrKxez7QoZROZMYrinttFZ/V5rbObEM9E5AR5Tv/Fr4IBywoS8ZtN16Xb+fZmibfU91yq9O2RYSvscncU2qEYmmaTenM0QlUO80ZKqPsM5JkgCNdcYZTUeHclWeyER3dSImNtlSKiSBSSTHthb11fkudjzdiUXua0NKVWyYuAOoDMcpXbD6NJmYqEA/iZ/AxtQt08pv0Mow581GPB0Uop5+qA2hCV85DpagE94a067sKcRui0rtkJzHem9k7xVL+2RoFm1fv3RnUkMwhAgMBAAECggEAAetkddzxrfc+7jgPylUIGb8pyoOUTC4Vqs/BgZI9xYAJksNT2QKRsFvHPfItNt4Ocqy8h4tnIL3GCU43C564B4p6AcjhE85GiN/O0BudPOKlfuQQ9mqExqMMHuYeQfz0cmzPDTSGMwWiv9v4KBH2pyvkCCAzNF6uG+rvawb4/NNVuiI7C8Ku/wYsamtbgjMZVOFFdScYgIw1BgA99RUU/fWBLMnTQkoyowSRb9eSmEUHjt/WQt+/QgKAT2WmuX4RhaGy0qcQLbNaJNKXdJ+PVhQrSiasINNtqYMa8GsQuuKsk3X8TCg9K6/lowivt5ruhyWcP2sx93zY/LGzIHgHcQKBgQDoZlcs9RWxTdGDdtH8kk0J/r+QtMijNzWI0a+t+ZsWOyd3rw+uM/8O4JTNP4Y98TvvxhJXewITbfiuOIbW1mxh8bnO/fcz7+RXZKgPDeoTeNo717tZFZGBEyUdH9M9Inqvht7+hjVDIMCYBDomYebdk3Xqo4mDBjLRdVNGrhGmVQKBgQDKS/MgTMK8Ktfnu1KzwCbn/FfHTOrp1a1t1wWPv9AW0rJPYeaP6lOkgIoO/1odG9qDDhdB6njqM+mKY5Yr3N94PHamHbwJUCmbkqEunCWpGzgcQZ1Q254xk9D7UKq/XUqW2WDqDq80GQeNial+fBc46yelQzokwdA+JdIFKoyinQKBgQCBems9V/rTAtkk1nFdt6EGXZEbLS3PiXXhGXo4gqV+OEzf6H/i/YMwJb2hsK+5GQrcps0XQihA7PctEb9GOMa/tu5fva0ZmaDtc94SLR1p5d4okyQFGPgtIp594HpPSEN0Qb9BrUJFeRz0VP6U3dzDPGHo7V4yyqRLgIN6EIcy1QKBgAqdh6mHPaTAHspDMyjJiYEc5cJIj/8rPkmIQft0FkhMUB0IRyAALNlyAUyeK61hW8sKvz+vPR8VEEk5xpSQp41YpuU6pDZc5YILZLfca8F+8yfQbZ/jll6Foi694efezl4yE/rUQG9cbOAJfEJt4o4TEOaEK5XoMbRBKc8pl22lAoGARTq0qOr9SStihRAy9a+8wi2WEwL4QHcmOjH7iAuJxy5b5TRDSjlk6h+0dnTItiFlTXdfpO8KhWA8EoSJVBZ1kcACQDFgMIA+VM+yXydtzMotOn21W4stfZ4I6dHFiujMsnKpNYVpQh3oCrJf4SeXiQDdiSCodqb1HlKkEc6naHQ=',
+    // 应用公钥证书（新版资金类接口转app_cert_sn）
+    'app_cert'    => '',
+    // 支付宝根证书（新版资金类接口转alipay_root_cert_sn）
+    'root_cert'   => '',
     // 支付成功通知地址
     'notify_url'  => '',
     // 网页支付回跳地址
diff --git a/composer.json b/composer.json
index 931573b..d21c7f0 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
     "php": ">=5.4",
     "ext-json": "*",
     "ext-curl": "*",
+    "ext-bcmath": "*",
     "ext-libxml": "*",
     "ext-openssl": "*",
     "ext-mbstring": "*",

From 3268e19c61bf151a42a28d7f6b40c27faf993c5e Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Wed, 11 Mar 2020 10:04:31 +0800
Subject: [PATCH 15/31] Update BasicAliPay.php

---
 WeChat/Contracts/BasicAliPay.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 468b03a..4532cc6 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -198,7 +198,7 @@ abstract class BasicAliPay
      */
     protected function getSign()
     {
-        $content = wordwrap($this->config->get('private_key'), 64, "\n", true);
+        $content = wordwrap($this->trimCert($this->config->get('private_key')), 64, "\n", true);
         $string = "-----BEGIN RSA PRIVATE KEY-----\n{$content}\n-----END RSA PRIVATE KEY-----";
         if ($this->options->get('sign_type') === 'RSA2') {
             openssl_sign($this->getSignContent($this->options->get(), true), $sign, $string, OPENSSL_ALGO_SHA256);
@@ -208,6 +208,17 @@ abstract class BasicAliPay
         return base64_encode($sign);
     }
 
+    /**
+     * 去除证书前后内容及空白
+     * @param string $sign
+     * @return string
+     */
+    protected function trimCert($sign)
+    {
+        if (file_exists($sign)) $sign = file_get_contents($sign);
+        return preg_replace(['/\s+/', '/\-{5}.*?\-{5}/'], '', $sign);
+    }
+
     /**
      * 数据签名处理
      * @param array $data 需要进行签名数据

From 8bfd9f9a6954b96797f110a33bb4eee9c7471234 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Wed, 11 Mar 2020 10:05:10 +0800
Subject: [PATCH 16/31] Update alipay.php

---
 _test/alipay.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/_test/alipay.php b/_test/alipay.php
index 16bfe40..beaf985 100644
--- a/_test/alipay.php
+++ b/_test/alipay.php
@@ -19,13 +19,13 @@ return [
     'sign_type'   => "RSA2",
     // 应用ID
     'appid'       => '2016090900468879',
-    // 支付宝公钥(1行填写，特别注意，这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制)
+    // 支付宝公钥 (1行填写，特别注意，这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制)
     'public_key'  => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB',
-    // 支付宝私钥(1行填写)
+    // 支付宝私钥 (1行填写)
     'private_key' => 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC3pbN7esinxgjE8uxXAsccgGNKIq+PR1LteNTFOy0fsete43ObQCrzd9DO0zaUeBUzpIOnxrKxez7QoZROZMYrinttFZ/V5rbObEM9E5AR5Tv/Fr4IBywoS8ZtN16Xb+fZmibfU91yq9O2RYSvscncU2qEYmmaTenM0QlUO80ZKqPsM5JkgCNdcYZTUeHclWeyER3dSImNtlSKiSBSSTHthb11fkudjzdiUXua0NKVWyYuAOoDMcpXbD6NJmYqEA/iZ/AxtQt08pv0Mow581GPB0Uop5+qA2hCV85DpagE94a067sKcRui0rtkJzHem9k7xVL+2RoFm1fv3RnUkMwhAgMBAAECggEAAetkddzxrfc+7jgPylUIGb8pyoOUTC4Vqs/BgZI9xYAJksNT2QKRsFvHPfItNt4Ocqy8h4tnIL3GCU43C564B4p6AcjhE85GiN/O0BudPOKlfuQQ9mqExqMMHuYeQfz0cmzPDTSGMwWiv9v4KBH2pyvkCCAzNF6uG+rvawb4/NNVuiI7C8Ku/wYsamtbgjMZVOFFdScYgIw1BgA99RUU/fWBLMnTQkoyowSRb9eSmEUHjt/WQt+/QgKAT2WmuX4RhaGy0qcQLbNaJNKXdJ+PVhQrSiasINNtqYMa8GsQuuKsk3X8TCg9K6/lowivt5ruhyWcP2sx93zY/LGzIHgHcQKBgQDoZlcs9RWxTdGDdtH8kk0J/r+QtMijNzWI0a+t+ZsWOyd3rw+uM/8O4JTNP4Y98TvvxhJXewITbfiuOIbW1mxh8bnO/fcz7+RXZKgPDeoTeNo717tZFZGBEyUdH9M9Inqvht7+hjVDIMCYBDomYebdk3Xqo4mDBjLRdVNGrhGmVQKBgQDKS/MgTMK8Ktfnu1KzwCbn/FfHTOrp1a1t1wWPv9AW0rJPYeaP6lOkgIoO/1odG9qDDhdB6njqM+mKY5Yr3N94PHamHbwJUCmbkqEunCWpGzgcQZ1Q254xk9D7UKq/XUqW2WDqDq80GQeNial+fBc46yelQzokwdA+JdIFKoyinQKBgQCBems9V/rTAtkk1nFdt6EGXZEbLS3PiXXhGXo4gqV+OEzf6H/i/YMwJb2hsK+5GQrcps0XQihA7PctEb9GOMa/tu5fva0ZmaDtc94SLR1p5d4okyQFGPgtIp594HpPSEN0Qb9BrUJFeRz0VP6U3dzDPGHo7V4yyqRLgIN6EIcy1QKBgAqdh6mHPaTAHspDMyjJiYEc5cJIj/8rPkmIQft0FkhMUB0IRyAALNlyAUyeK61hW8sKvz+vPR8VEEk5xpSQp41YpuU6pDZc5YILZLfca8F+8yfQbZ/jll6Foi694efezl4yE/rUQG9cbOAJfEJt4o4TEOaEK5XoMbRBKc8pl22lAoGARTq0qOr9SStihRAy9a+8wi2WEwL4QHcmOjH7iAuJxy5b5TRDSjlk6h+0dnTItiFlTXdfpO8KhWA8EoSJVBZ1kcACQDFgMIA+VM+yXydtzMotOn21W4stfZ4I6dHFiujMsnKpNYVpQh3oCrJf4SeXiQDdiSCodqb1HlKkEc6naHQ=',
-    // 应用公钥证书（新版资金类接口转app_cert_sn）
+    // 应用公钥证书（新版资金类接口转 app_cert_sn）
     'app_cert'    => '',
-    // 支付宝根证书（新版资金类接口转alipay_root_cert_sn）
+    // 支付宝根证书（新版资金类接口转 alipay_root_cert_sn）
     'root_cert'   => '',
     // 支付成功通知地址
     'notify_url'  => '',

From c30e880bf70709a50e9b73c9dc574ed6ca2d6156 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Wed, 11 Mar 2020 17:50:03 +0800
Subject: [PATCH 17/31] Update BasicAliPay.php

---
 WeChat/Contracts/BasicAliPay.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 4532cc6..1c0c49f 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -215,7 +215,7 @@ abstract class BasicAliPay
      */
     protected function trimCert($sign)
     {
-        if (file_exists($sign)) $sign = file_get_contents($sign);
+        // if (file_exists($sign)) $sign = file_get_contents($sign);
         return preg_replace(['/\s+/', '/\-{5}.*?\-{5}/'], '', $sign);
     }
 
@@ -294,7 +294,7 @@ abstract class BasicAliPay
      */
     public function getCertSN($sign)
     {
-        if (file_exists($sign)) $sign = file_get_contents($sign);
+        // if (file_exists($sign)) $sign = file_get_contents($sign);
         $ssl = openssl_x509_parse($sign);
         return md5($this->_arr2str(array_reverse($ssl['issuer'])) . $ssl['serialNumber']);
     }
@@ -307,7 +307,7 @@ abstract class BasicAliPay
     public function getRootCertSN($sign)
     {
         $sn = null;
-        if (file_exists($sign)) $sign = file_get_contents($sign);
+        // if (file_exists($sign)) $sign = file_get_contents($sign);
         $array = explode("-----END CERTIFICATE-----", $sign);
         for ($i = 0; $i < count($array) - 1; $i++) {
             $ssl[$i] = openssl_x509_parse($array[$i] . "-----END CERTIFICATE-----");

From 17ca010939949171b272405c58788be48820f3c5 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Wed, 11 Mar 2020 18:38:22 +0800
Subject: [PATCH 18/31] Create Trade.php

---
 AliPay/Trade.php | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 AliPay/Trade.php

diff --git a/AliPay/Trade.php b/AliPay/Trade.php
new file mode 100644
index 0000000..95cc410
--- /dev/null
+++ b/AliPay/Trade.php
@@ -0,0 +1,58 @@
+options->set('method', $method);
+        return $this;
+    }
+
+    /**
+     * 获取交易接口地址
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->options->get('method');
+    }
+
+    /**
+     * 执行通过接口
+     * @param array $options
+     * @return array|bool|mixed
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function apply($options)
+    {
+        return $this->getResult($options);
+    }
+}
\ No newline at end of file

From 72749aefe2c8efd7e51a5e39654a775a1d09c118 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Wed, 11 Mar 2020 18:39:09 +0800
Subject: [PATCH 19/31] Update Trade.php

---
 AliPay/Trade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AliPay/Trade.php b/AliPay/Trade.php
index 95cc410..34ce19f 100644
--- a/AliPay/Trade.php
+++ b/AliPay/Trade.php
@@ -47,7 +47,7 @@ class Trade extends BasicAliPay
     /**
      * 执行通过接口
      * @param array $options
-     * @return array|bool|mixed
+     * @return array|boolean|mixed
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */

From e3254d4e6c39380ef7781a2f064c0ca851e6be5d Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Wed, 11 Mar 2020 18:40:01 +0800
Subject: [PATCH 20/31] Update Trade.php

---
 AliPay/Trade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AliPay/Trade.php b/AliPay/Trade.php
index 34ce19f..e622544 100644
--- a/AliPay/Trade.php
+++ b/AliPay/Trade.php
@@ -19,7 +19,7 @@ use WeChat\Contracts\BasicAliPay;
 /**
  * 支付宝标准接口
  * Class Trade
- * @package WePay
+ * @package AliPay
  */
 class Trade extends BasicAliPay
 {

From f4ae17165ad0c8b4121365cc1d34665e57ded7ac Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Thu, 12 Mar 2020 09:51:56 +0800
Subject: [PATCH 21/31] Update Trade.php

---
 AliPay/Trade.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/AliPay/Trade.php b/AliPay/Trade.php
index e622544..aa289c9 100644
--- a/AliPay/Trade.php
+++ b/AliPay/Trade.php
@@ -44,6 +44,28 @@ class Trade extends BasicAliPay
         return $this->options->get('method');
     }
 
+    /**
+     * 设置接口公共参数
+     * @param array $option
+     * @return Trade
+     */
+    public function setOption($option = [])
+    {
+        foreach ($option as $key => $vo) {
+            $this->options->set($key, $vo);
+        }
+        return $this;
+    }
+
+    /**
+     * 获取接口公共参数
+     * @return array|string|null
+     */
+    public function getOption()
+    {
+        return $this->options->get();
+    }
+
     /**
      * 执行通过接口
      * @param array $options

From 9afb0a29c658d52dc7b9d46d2f848602124936b7 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Sat, 14 Mar 2020 14:58:18 +0800
Subject: [PATCH 22/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=9B=B4=E6=92=AD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php          |  2 +-
 WeMini/Live.php | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 WeMini/Live.php

diff --git a/We.php b/We.php
index 83da261..fb3e691 100644
--- a/We.php
+++ b/We.php
@@ -85,7 +85,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.19';
+    const VERSION = '1.2.20';
 
     /**
      * 静态配置
diff --git a/WeMini/Live.php b/WeMini/Live.php
new file mode 100644
index 0000000..a7ff7a0
--- /dev/null
+++ b/WeMini/Live.php
@@ -0,0 +1,56 @@
+registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['start' => $start, 'limit' => $limit], true);
+    }
+
+    /**
+     * 获取回放源视频
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getLiveInfo($data = [])
+    {
+        $url = 'http://api.weixin.qq.com/wxa/business/getliveinfo?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+}
\ No newline at end of file

From e8161351be5a535fc2071cc6c17914d692f52053 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Sat, 14 Mar 2020 15:00:10 +0800
Subject: [PATCH 23/31] Update We.php

---
 We.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/We.php b/We.php
index fb3e691..a9a5efa 100644
--- a/We.php
+++ b/We.php
@@ -56,6 +56,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WeMini\Delivery WeMiniDelivery($options = []) static 小程序即时配送
  * @method \WeMini\Guide WeMiniGuide($options = []) static 小程序导购助手
  * @method \WeMini\Image WeMiniImage($options = []) static 小程序图像处理
+ * @method \WeMini\Live WeMiniLive($options = []) static 小程序直播接口
  * @method \WeMini\Logistics WeMiniLogistics($options = []) static 小程序物流助手
  * @method \WeMini\Message WeMiniMessage($options = []) static 小程序动态消息
  * @method \WeMini\Newtmpl WeMiniNewtmpl($options = []) static 小程序订阅消息

From d42e8836f706bc1d7e48e2fd27f64450e2ed072a Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Sun, 26 Apr 2020 11:08:57 +0800
Subject: [PATCH 24/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0xml=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php                     |  2 +-
 WeChat/Contracts/Tools.php | 15 +++++++++++++++
 WePay/Bill.php             |  2 +-
 composer.json              |  1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/We.php b/We.php
index a9a5efa..6523ec3 100644
--- a/We.php
+++ b/We.php
@@ -86,7 +86,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.20';
+    const VERSION = '1.2.21';
 
     /**
      * 静态配置
diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 60a435d..007bc3d 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -164,6 +164,21 @@ class Tools
         return json_decode(json_encode($data), true);
     }
 
+    /**
+     * 解析XML文本内容
+     * @param string $xml
+     * @return boolean|mixed
+     */
+    public static function xml3arr($xml)
+    {
+        $parser = xml_parser_create();
+        if (!xml_parse($parser, $xml, true)) {
+            xml_parser_free($parser);
+            return false;
+        }
+        return json_decode(json_encode(simplexml_load_string($xml)), true);
+    }
+
     /**
      * 数组转xml内容
      * @param array $data
diff --git a/WePay/Bill.php b/WePay/Bill.php
index 4c853c7..602fbc7 100644
--- a/WePay/Bill.php
+++ b/WePay/Bill.php
@@ -39,7 +39,7 @@ class Bill extends BasicWePay
         $params = $this->params->merge($options);
         $params['sign'] = $this->getPaySign($params, 'MD5');
         $result = Tools::post('https://api.mch.weixin.qq.com/pay/downloadbill', Tools::arr2xml($params));
-        if (($jsonData = Tools::xml2arr($result))) {
+        if (is_array($jsonData = Tools::xml3arr($result))) {
             if ($jsonData['return_code'] !== 'SUCCESS') {
                 throw new InvalidResponseException($jsonData['return_msg'], '0');
             }
diff --git a/composer.json b/composer.json
index d21c7f0..b0c41e3 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,7 @@
   ],
   "require": {
     "php": ">=5.4",
+    "ext-xml": "*",
     "ext-json": "*",
     "ext-curl": "*",
     "ext-bcmath": "*",

From 90b5b091a29a6a8196f744784ad14566d955af6e Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Sun, 26 Apr 2020 11:12:37 +0800
Subject: [PATCH 25/31] Update Tools.php

---
 WeChat/Contracts/Tools.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 007bc3d..ce353f6 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -171,12 +171,11 @@ class Tools
      */
     public static function xml3arr($xml)
     {
-        $parser = xml_parser_create();
-        if (!xml_parse($parser, $xml, true)) {
-            xml_parser_free($parser);
-            return false;
+        if (xml_parse($parser = xml_parser_create(), $xml, true)) {
+            return json_decode(json_encode(simplexml_load_string($xml)), true);
         }
-        return json_decode(json_encode(simplexml_load_string($xml)), true);
+        if (is_resource($parser)) xml_parser_free($parser);
+        return false;
     }
 
     /**

From 0b7ec9fff9ce8269a81dbeec19cbb260c872ac93 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Sun, 26 Apr 2020 11:13:59 +0800
Subject: [PATCH 26/31] Update Tools.php

---
 WeChat/Contracts/Tools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index ce353f6..e9450b8 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -181,7 +181,7 @@ class Tools
     /**
      * 数组转xml内容
      * @param array $data
-     * @return null|string|string
+     * @return null|string
      */
     public static function arr2json($data)
     {

From 656223cd2aa431823d11142de9c9195639e8bbae Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Sun, 26 Apr 2020 11:18:55 +0800
Subject: [PATCH 27/31] Update Tools.php

---
 WeChat/Contracts/Tools.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index e9450b8..4133f24 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -171,11 +171,13 @@ class Tools
      */
     public static function xml3arr($xml)
     {
-        if (xml_parse($parser = xml_parser_create(), $xml, true)) {
-            return json_decode(json_encode(simplexml_load_string($xml)), true);
+        $parser = xml_parser_create();
+        if (xml_parse($parser, $xml, true)) {
+            return self::xml2arr($xml);
+        } else {
+            xml_parser_free($parser);
+            return false;
         }
-        if (is_resource($parser)) xml_parser_free($parser);
-        return false;
     }
 
     /**

From 5cf008c37471f775ae28a23fd1ac06c91eac682f Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Sun, 26 Apr 2020 11:22:09 +0800
Subject: [PATCH 28/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9xml3arr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/Tools.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 4133f24..fe3882e 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -171,13 +171,8 @@ class Tools
      */
     public static function xml3arr($xml)
     {
-        $parser = xml_parser_create();
-        if (xml_parse($parser, $xml, true)) {
-            return self::xml2arr($xml);
-        } else {
-            xml_parser_free($parser);
-            return false;
-        }
+        $state = xml_parse($parser = xml_parser_create(), $xml, true);
+        return xml_parser_free($parser) && $state ? self::xml2arr($xml) : false;
     }
 
     /**

From 59dc89244e27fa12eb39b0d4d866da526ee38994 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Thu, 21 May 2020 10:40:44 +0800
Subject: [PATCH 29/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9AccessToken=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicWeChat.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 81c3645..af4337b 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -205,17 +205,15 @@ class BasicWeChat
      * @param string $url 接口地址
      * @param string $method 当前接口方法
      * @param array $arguments 请求参数
-     * @return mixed
+     * @return string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
     protected function registerApi(&$url, $method, $arguments = [])
     {
         $this->currentMethod = ['method' => $method, 'arguments' => $arguments];
-        if (empty($this->access_token)) {
-            $this->access_token = $this->getAccessToken();
-        }
-        return $url = str_replace('ACCESS_TOKEN', $this->access_token, $url);
+        if (empty($this->access_token)) $this->access_token = $this->getAccessToken();
+        return $url = str_replace('ACCESS_TOKEN', urlencode($this->access_token), $url);
     }
 
     /**

From 7eb7f6a2d8aa4a105208c7dff6428dcecd0c7059 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Sat, 4 Jul 2020 15:24:41 +0800
Subject: [PATCH 30/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php          |   2 +-
 WeMini/Live.php | 129 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 128 insertions(+), 3 deletions(-)

diff --git a/We.php b/We.php
index 6523ec3..26865b6 100644
--- a/We.php
+++ b/We.php
@@ -86,7 +86,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.21';
+    const VERSION = '1.2.22';
 
     /**
      * 静态配置
diff --git a/WeMini/Live.php b/WeMini/Live.php
index a7ff7a0..98893ce 100644
--- a/WeMini/Live.php
+++ b/WeMini/Live.php
@@ -23,6 +23,19 @@ use WeChat\Contracts\BasicWeChat;
  */
 class Live extends BasicWeChat
 {
+    /**
+     * 创建直播间
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function create($data)
+    {
+        $url = 'https://api.weixin.qq.com/wxaapi/broadcast/room/create?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
 
     /**
      * 获取直播房间列表
@@ -34,7 +47,7 @@ class Live extends BasicWeChat
      */
     public function getLiveList($start = 0, $limit = 10)
     {
-        $url = 'http://api.weixin.qq.com/wxa/business/getliveinfo?access_token=ACCESS_TOKEN';
+        $url = 'https://api.weixin.qq.com/wxa/business/getliveinfo?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->callPostApi($url, ['start' => $start, 'limit' => $limit], true);
     }
@@ -48,7 +61,119 @@ class Live extends BasicWeChat
      */
     public function getLiveInfo($data = [])
     {
-        $url = 'http://api.weixin.qq.com/wxa/business/getliveinfo?access_token=ACCESS_TOKEN';
+        $url = 'https://api.weixin.qq.com/wxa/business/getliveinfo?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 直播间导入商品
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addLiveGoods($data = [])
+    {
+        $url = 'https://api.weixin.qq.com/wxaapi/broadcast/room/addgoods?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 商品添加并提审
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addGoods($data)
+    {
+        $url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/add?access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 商品撤回审核
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function resetAuditGoods($data)
+    {
+        $url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/resetaudit?access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 重新提交审核
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function auditGoods($data)
+    {
+        $url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/audit?access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 删除商品
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function deleteGoods($data)
+    {
+        $url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/delete?access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 更新商品
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function updateGoods($data)
+    {
+        $url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/update?access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 获取商品状态
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function stateGoods($data)
+    {
+        $url = "https://api.weixin.qq.com/wxa/business/getgoodswarehouse?access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 获取商品列表
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getGoods($data)
+    {
+        $url = "https://api.weixin.qq.com/wxaapi/broadcast/goods/getapproved?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->callPostApi($url, $data, true);
     }

From f070dd076a4137ff4e86600b63d1ccfe2f744a92 Mon Sep 17 00:00:00 2001
From: Anyon 
Date: Mon, 20 Jul 2020 14:55:26 +0800
Subject: [PATCH 31/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9json=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php                           |  2 +-
 WeChat/Contracts/BasicWeChat.php | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/We.php b/We.php
index 26865b6..846476c 100644
--- a/We.php
+++ b/We.php
@@ -86,7 +86,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.22';
+    const VERSION = '1.2.23';
 
     /**
      * 静态配置
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index af4337b..403a62c 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -94,7 +94,7 @@ class BasicWeChat
     }
 
     /**
-     * 获取访问accessToken
+     * 获取访问 AccessToken
      * @return string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
@@ -166,15 +166,15 @@ class BasicWeChat
     {
         try {
             return Tools::json2arr(Tools::get($url));
-        } catch (InvalidResponseException $e) {
+        } catch (InvalidResponseException $exception) {
             if (isset($this->currentMethod['method']) && empty($this->isTry)) {
-                if (in_array($e->getCode(), ['40014', '40001', '41001', '42001'])) {
+                if (in_array($exception->getCode(), ['40014', '40001', '41001', '42001'])) {
                     $this->delAccessToken();
                     $this->isTry = true;
                     return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
                 }
             }
-            throw new InvalidResponseException($e->getMessage(), $e->getCode());
+            throw new InvalidResponseException($exception->getMessage(), $exception->getCode());
         }
     }
 
@@ -190,13 +190,15 @@ class BasicWeChat
     protected function httpPostForJson($url, array $data, $buildToJson = true)
     {
         try {
-            return Tools::json2arr(Tools::post($url, $buildToJson ? Tools::arr2json($data) : $data));
-        } catch (InvalidResponseException $e) {
-            if (!$this->isTry && in_array($e->getCode(), ['40014', '40001', '41001', '42001'])) {
+            $options = [];
+            if ($buildToJson) $options['headers'] = ['Content-Type: application/json'];
+            return Tools::json2arr(Tools::post($url, $buildToJson ? Tools::arr2json($data) : $data, $options));
+        } catch (InvalidResponseException $exception) {
+            if (!$this->isTry && in_array($exception->getCode(), ['40014', '40001', '41001', '42001'])) {
                 [$this->delAccessToken(), $this->isTry = true];
                 return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
             }
-            throw new InvalidResponseException($e->getMessage(), $e->getCode());
+            throw new InvalidResponseException($exception->getMessage(), $exception->getCode());
         }
     }