From f9cad0f2221bec529c8908175e93d2891377d6d3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 26 Mar 2018 10:31:05 +0800
Subject: [PATCH 001/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E7=B2=89=E4=B8=9D=E6=A0=87=E7=AD=BE=E6=8E=A5=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Tags.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WeChat/Tags.php b/WeChat/Tags.php
index db26acf..99f3f3b 100644
--- a/WeChat/Tags.php
+++ b/WeChat/Tags.php
@@ -90,7 +90,7 @@ class Tags extends BasicWeChat
     {
         $url = 'https://api.weixin.qq.com/cgi-bin/tags/members/batchtagging?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->httpPostForJson($url, ['openid_list' => $openids, $tagId]);
+        return $this->httpPostForJson($url, ['openid_list' => $openids, 'tag_id' => $tagId]);
     }
 
     /**
@@ -105,7 +105,7 @@ class Tags extends BasicWeChat
     {
         $url = 'https://api.weixin.qq.com/cgi-bin/tags/members/batchuntagging?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->httpPostForJson($url, ['openid_list' => $openids, $tagId]);
+        return $this->httpPostForJson($url, ['openid_list' => $openids, 'tag_id' => $tagId]);
     }
 
     /**

From 9ba300d0b171fd83e9b958d4f25ed4b0b3d16469 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 26 Mar 2018 14:32:30 +0800
Subject: [PATCH 002/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=B2=89=E4=B8=9D=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Tags.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WeChat/Tags.php b/WeChat/Tags.php
index 99f3f3b..a13c79f 100644
--- a/WeChat/Tags.php
+++ b/WeChat/Tags.php
@@ -90,7 +90,7 @@ class Tags extends BasicWeChat
     {
         $url = 'https://api.weixin.qq.com/cgi-bin/tags/members/batchtagging?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->httpPostForJson($url, ['openid_list' => $openids, 'tag_id' => $tagId]);
+        return $this->httpPostForJson($url, ['openid_list' => $openids, 'tagid' => $tagId]);
     }
 
     /**
@@ -105,7 +105,7 @@ class Tags extends BasicWeChat
     {
         $url = 'https://api.weixin.qq.com/cgi-bin/tags/members/batchuntagging?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->httpPostForJson($url, ['openid_list' => $openids, 'tag_id' => $tagId]);
+        return $this->httpPostForJson($url, ['openid_list' => $openids, 'tagid' => $tagId]);
     }
 
     /**

From cccd44dad58f2f33e81e7d8321ee1550f85cc4a5 Mon Sep 17 00:00:00 2001
From: Cxphp <cxphp@qq.com>
Date: Mon, 9 Apr 2018 18:55:25 +0800
Subject: [PATCH 003/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E7=AD=BE=E5=90=8D=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 260e8be..ea2aeb5 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -196,7 +196,7 @@ class Pay
     public function createTransfers(array $options)
     {
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers';
-        return $this->callPostApi($url, $options, true);
+        return $this->callPostApi($url, $options, true, false);
     }
 
     /**
@@ -208,7 +208,7 @@ class Pay
     public function queryTransfers($partner_trade_no)
     {
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
-        return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true);
+        return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, false);
     }
 
     /**
@@ -248,10 +248,11 @@ class Pay
      * @param string $url 请求
      * @param array $data 接口参数
      * @param bool $isCert 是否需要使用双向证书
+     * @param bool $needSignType 是否需要传签名类型参数
      * @return array
      * @throws InvalidResponseException
      */
-    public function callPostApi($url, array $data, $isCert = false)
+    public function callPostApi($url, array $data, $isCert = false, $needSignType = true)
     {
         $option = [];
         if ($isCert) {
@@ -264,7 +265,9 @@ class Pay
             $option['ssl_key'] = $this->config->get('ssl_key');
         }
         $params = $this->params->merge($data);
-        $params['sign_type'] = 'HMAC-SHA256';
+        if ($needSignType) {
+            $params['sign_type'] = 'HMAC-SHA256';
+        }
         $params['sign'] = $this->getPaySign($params);
         $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
         if ($result['return_code'] !== 'SUCCESS') {

From e05fe6bb24438d15259a6af4915bd0638dc3914a Mon Sep 17 00:00:00 2001
From: Admin <zoujingli@vip.qq.com>
Date: Mon, 9 Apr 2018 19:07:00 +0800
Subject: [PATCH 004/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index ea2aeb5..f5c4ab9 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -196,7 +196,7 @@ class Pay
     public function createTransfers(array $options)
     {
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers';
-        return $this->callPostApi($url, $options, true, false);
+        return $this->callPostApi($url, $options, true, 'MD5', false);
     }
 
     /**
@@ -208,7 +208,7 @@ class Pay
     public function queryTransfers($partner_trade_no)
     {
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
-        return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, false);
+        return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
     }
 
     /**
@@ -230,9 +230,10 @@ class Pay
     /**
      * 生成支付签名
      * @param array $data
+     * @param string $signType
      * @return string
      */
-    public function getPaySign(array $data)
+    public function getPaySign(array $data, $signType = 'MD5')
     {
         unset($data['sign']);
         ksort($data);
@@ -240,6 +241,9 @@ class Pay
         foreach ($data as $k => $v) {
             $str .= "{$k}={$v}&";
         }
+        if ($signType === 'MD5') {
+            return strtoupper(md5("{$str}key={$key}"));
+        }
         return strtoupper(hash_hmac('SHA256', "{$str}key={$key}", $key));
     }
 
@@ -248,11 +252,12 @@ class Pay
      * @param string $url 请求
      * @param array $data 接口参数
      * @param bool $isCert 是否需要使用双向证书
+     * @param string $signType 数据签名类型 MD5|SHA256
      * @param bool $needSignType 是否需要传签名类型参数
      * @return array
      * @throws InvalidResponseException
      */
-    public function callPostApi($url, array $data, $isCert = false, $needSignType = true)
+    public function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true)
     {
         $option = [];
         if ($isCert) {
@@ -266,9 +271,9 @@ class Pay
         }
         $params = $this->params->merge($data);
         if ($needSignType) {
-            $params['sign_type'] = 'HMAC-SHA256';
+            $params['sign_type'] = strtoupper($signType);
         }
-        $params['sign'] = $this->getPaySign($params);
+        $params['sign'] = $this->getPaySign($params, $signType);
         $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
         if ($result['return_code'] !== 'SUCCESS') {
             throw new InvalidResponseException($result['return_msg'], '0');

From bb07da202beb1bf57294c82585cb537d63db8355 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 18 Apr 2018 17:43:08 +0800
Subject: [PATCH 005/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeMini/Crypt.php                |  44 ++++++++
 WeMini/Plugs.php                |  98 ++++++++++++++++++
 WeMini/Poi.php                  |  91 +++++++++++++++++
 WeMini/Qrcode.php               |  82 +++++++++++++++
 WeMini/Template.php             | 110 ++++++++++++++++++++
 WeMini/Total.php                | 176 ++++++++++++++++++++++++++++++++
 WeMini/crypt/errorCode.php      |  20 ++++
 WeMini/crypt/wxBizDataCrypt.php |  59 +++++++++++
 composer.json                   |   3 +-
 include.php                     |  12 ++-
 10 files changed, 691 insertions(+), 4 deletions(-)
 create mode 100644 WeMini/Crypt.php
 create mode 100644 WeMini/Plugs.php
 create mode 100644 WeMini/Poi.php
 create mode 100644 WeMini/Qrcode.php
 create mode 100644 WeMini/Template.php
 create mode 100644 WeMini/Total.php
 create mode 100644 WeMini/crypt/errorCode.php
 create mode 100644 WeMini/crypt/wxBizDataCrypt.php

diff --git a/WeMini/Crypt.php b/WeMini/Crypt.php
new file mode 100644
index 0000000..46fbad0
--- /dev/null
+++ b/WeMini/Crypt.php
@@ -0,0 +1,44 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 数据加密处理
+ * Class Crypt
+ * @package WeMini
+ */
+class Crypt extends BasicWeChat
+{
+
+    /**
+     * 数据签名校验
+     * @param string $iv
+     * @param string $encryptedData
+     * @param string $sessionKey
+     * @return bool
+     */
+    public function decode($iv, $encryptedData, $sessionKey)
+    {
+        require_once __DIR__ . DIRECTORY_SEPARATOR . 'wxBizDataCrypt.php';
+        $pc = new \WXBizDataCrypt($this->config->get('appid'), $sessionKey);
+        $errCode = $pc->decryptData($encryptedData, $iv, $data);
+        if ($errCode == 0) {
+            return $data;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/WeMini/Plugs.php b/WeMini/Plugs.php
new file mode 100644
index 0000000..8546fbf
--- /dev/null
+++ b/WeMini/Plugs.php
@@ -0,0 +1,98 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 微信小程序插件管理
+ * Class Plugs
+ * @package WeMini
+ */
+class Plugs extends BasicWeChat
+{
+    /**
+     * 1.申请使用插件
+     * @param string $plugin_appid 插件appid
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function apply($plugin_appid)
+    {
+        $url = 'https://api.weixin.qq.com/wxa/plugin?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['action' => 'apply', 'plugin_appid' => $plugin_appid], true);
+    }
+
+    /**
+     * 2.查询已添加的插件
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getList()
+    {
+        $url = 'https://api.weixin.qq.com/wxa/plugin?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['action' => 'list'], true);
+    }
+
+    /**
+     * 3.删除已添加的插件
+     * @param string $plugin_appid 插件appid
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function unbind($plugin_appid)
+    {
+        $url = 'https://api.weixin.qq.com/wxa/plugin?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['action' => 'list', 'plugin_appid' => $plugin_appid], true);
+    }
+
+
+    /**
+     * 4.获取当前所有插件使用方（供插件开发者调用）
+     * @param integer $page 拉取第page页的数据
+     * @param integer $num 表示每页num条记录
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function devApplyList($page = 1, $num = 10)
+    {
+        $url = 'https://api.weixin.qq.com/wxa/plugin?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        $data = ['action' => 'dev_apply_list', 'page' => $page, 'num' => $num];
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 5.修改插件使用申请的状态（供插件开发者调用）
+     * @param string $action dev_agree：同意申请；dev_refuse：拒绝申请；dev_delete：删除已拒绝的申请者
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function devAgree($action = 'dev_agree')
+    {
+        $url = 'https://api.weixin.qq.com/wxa/plugin?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['action' => $action], true);
+    }
+
+}
\ No newline at end of file
diff --git a/WeMini/Poi.php b/WeMini/Poi.php
new file mode 100644
index 0000000..c81ef5d
--- /dev/null
+++ b/WeMini/Poi.php
@@ -0,0 +1,91 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 微信小程序地址管理
+ * Class Poi
+ * @package WeMini
+ */
+class Poi extends BasicWeChat
+{
+    /**
+     * 添加地点
+     * @param string $related_name 经营资质主体
+     * @param string $related_credential 经营资质证件号
+     * @param string $related_address 经营资质地址
+     * @param string $related_proof_material 相关证明材料照片临时素材mediaid
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addBearByPoi($related_name, $related_credential, $related_address, $related_proof_material)
+    {
+        $url = 'https://api.weixin.qq.com/wxa/addnearbypoi?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        $data = [
+            'related_name'    => $related_name, 'related_credential' => $related_credential,
+            'related_address' => $related_address, 'related_proof_material' => $related_proof_material,
+        ];
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 查看地点列表
+     * @param integer $page 起始页id（从1开始计数）
+     * @param integer $page_rows 每页展示个数（最多1000个）
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getNearByPoiList($page = 1, $page_rows = 1000)
+    {
+        $url = "https://api.weixin.qq.com/wxa/getnearbypoilist?page={$page}&page_rows={$page_rows}&access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callGetApi($url);
+    }
+
+    /**
+     * 删除地点
+     * @param string $poi_id 附近地点ID
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function delNearByPoiList($poi_id)
+    {
+        $url = "https://api.weixin.qq.com/wxa/delnearbypoi?access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['poi_id' => $poi_id], true);
+    }
+
+    /**
+     * 展示/取消展示附近小程序
+     * @param string $poi_id 附近地点ID
+     * @param string $status 0：取消展示；1：展示
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function setNearByPoiShowStatus($poi_id, $status)
+    {
+        $url = "https://api.weixin.qq.com/wxa/setnearbypoishowstatus?access_token=ACCESS_TOKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['poi_id' => $poi_id, 'status' => $status], true);
+    }
+
+}
\ No newline at end of file
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
new file mode 100644
index 0000000..217d4d5
--- /dev/null
+++ b/WeMini/Qrcode.php
@@ -0,0 +1,82 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 微信小程序二维码管理
+ * Class Qrcode
+ * @package WeMini
+ */
+class Qrcode extends BasicWeChat
+{
+
+    /**
+     * 获取小程序码（永久有效）
+     * 接口A: 适用于需要的码数量较少的业务场景
+     * @param string $path 不能为空，最大长度 128 字节
+     * @param integer $width 二维码的宽度
+     * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
+     * @param array $line_color auto_color 为 false 时生效
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getCode($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
+    {
+        $url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        $data = ['path' => $path, 'width' => $width, 'auto_color' => false, 'line_color' => $line_color];
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 获取小程序码（永久有效）
+     * 接口B：适用于需要的码数量极多的业务场景
+     * @param string $scene 最大32个可见字符，只支持数字
+     * @param string $page 必须是已经发布的小程序存在的页面
+     * @param integer $width 二维码的宽度
+     * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
+     * @param array $line_color auto_color 为 false 时生效
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getCodeUnlimit($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
+    {
+        $url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        $data = ['scene' => $scene, 'width' => $width, 'auto_color' => false, 'line_color' => $line_color];
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 获取小程序二维码（永久有效）
+     * 接口C：适用于需要的码数量较少的业务场景
+     * @param string $path 不能为空，最大长度 128 字节
+     * @param integer $width 二维码的宽度
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function createQrcode($path, $width = 430)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['path' => $path, 'width' => $width], true);
+    }
+
+}
\ No newline at end of file
diff --git a/WeMini/Template.php b/WeMini/Template.php
new file mode 100644
index 0000000..516d407
--- /dev/null
+++ b/WeMini/Template.php
@@ -0,0 +1,110 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 公众号小程序模板消息支持
+ * Class Mini
+ * @package WeChat
+ */
+class Template extends BasicWeChat
+{
+
+    /**
+     * 获取小程序模板库标题列表
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getTemplateLibraryList()
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/wxopen/template/library/list?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['offset' => '0', 'count' => '20'], true);
+    }
+
+    /**
+     * 获取模板库某个模板标题下关键词库
+     * @param string $template_id 模板标题id，可通过接口获取，也可登录小程序后台查看获取
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getTemplateLibrary($template_id)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/wxopen/template/library/get?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['id' => $template_id], true);
+    }
+
+    /**
+     * 组合模板并添加至帐号下的个人模板库
+     * @param string $template_id 模板标题id，可通过接口获取，也可登录小程序后台查看获取
+     * @param array $keyword_id_list 开发者自行组合好的模板关键词列表，关键词顺序可以自由搭配（例如[3,5,4]或[4,5,3]），最多支持10个关键词组合
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addTemplate($template_id, array $keyword_id_list)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/wxopen/template/add?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['id' => $template_id, 'keyword_id_list' => $keyword_id_list], true);
+    }
+
+    /**
+     * 获取帐号下已存在的模板列表
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getTemplateList()
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/wxopen/template/list?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['offset' => '0', 'count' => '20'], true);
+    }
+
+    /**
+     * 删除模板消息
+     * @param string $template_id 要删除的模板id
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function delTemplate($template_id)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/wxopen/template/del?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['template_id' => $template_id], true);
+    }
+
+    /**
+     * 发送模板消息
+     * @param array $data 发送的消息对象数组
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function send(array $data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?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/Total.php b/WeMini/Total.php
new file mode 100644
index 0000000..9d55a6b
--- /dev/null
+++ b/WeMini/Total.php
@@ -0,0 +1,176 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 微信小程序数据接口
+ * Class Total
+ * @package WeMini
+ */
+class Total extends BasicWeChat
+{
+    /**
+     * 数据分析接口
+     * @param string $begin_date 开始日期
+     * @param string $end_date 结束日期，限定查询1天数据，end_date允许设置的最大值为昨日
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidDailySummarytrend($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappiddailysummarytrend?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 访问分析
+     * @param string $begin_date 开始日期
+     * @param string $end_date 结束日期，限定查询1天数据，end_date允许设置的最大值为昨日
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidDailyVisittrend($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappiddailyvisittrend?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 周趋势
+     * @param string $begin_date 开始日期，为周一日期
+     * @param string $end_date 结束日期，为周日日期，限定查询一周数据
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidWeeklyVisittrend($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappidweeklyvisittrend?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 月趋势
+     * @param string $begin_date 开始日期，为自然月第一天
+     * @param string $end_date 结束日期，为自然月最后一天，限定查询一个月数据
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidMonthlyVisittrend($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappidmonthlyvisittrend?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 访问分布
+     * @param string $begin_date 开始日期
+     * @param string $end_date 结束日期，限定查询1天数据，end_date允许设置的最大值为昨日
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidVisitdistribution($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappidvisitdistribution?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 日留存
+     * @param string $begin_date 开始日期
+     * @param string $end_date 结束日期，限定查询1天数据，end_date允许设置的最大值为昨日
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidDailyRetaininfo($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappiddailyretaininfo?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 周留存
+     * @param string $begin_date 开始日期，为周一日期
+     * @param string $end_date 结束日期，为周日日期，限定查询一周数据
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidWeeklyRetaininfo($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappidweeklyretaininfo?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 月留存
+     * @param string $begin_date 开始日期，为自然月第一天
+     * @param string $end_date 结束日期，为自然月最后一天，限定查询一个月数据
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidMonthlyRetaininfo($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappidmonthlyretaininfo?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 访问页面
+     * @param string $begin_date 开始日期
+     * @param string $end_date 结束日期，限定查询1天数据，end_date允许设置的最大值为昨日
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidVisitPage($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappidvisitpage?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+    /**
+     * 用户画像
+     * @param string $begin_date 开始日期
+     * @param string $end_date 结束日期，开始日期与结束日期相差的天数限定为0/6/29，分别表示查询最近1/7/30天数据，end_date允许设置的最大值为昨日
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getWeanalysisAppidUserportrait($begin_date, $end_date)
+    {
+        $url = 'https://api.weixin.qq.com/datacube/getweanalysisappiduserportrait?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['begin_date' => $begin_date, 'end_date' => $end_date], true);
+    }
+
+}
\ No newline at end of file
diff --git a/WeMini/crypt/errorCode.php b/WeMini/crypt/errorCode.php
new file mode 100644
index 0000000..a4f8e72
--- /dev/null
+++ b/WeMini/crypt/errorCode.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * error code 说明.
+ * <ul>
+ *    <li>-41001: encodingAesKey 非法</li>
+ *    <li>-41003: aes 解密失败</li>
+ *    <li>-41004: 解密后得到的buffer非法</li>
+ *    <li>-41005: base64加密失败</li>
+ *    <li>-41016: base64解密失败</li>
+ * </ul>
+ */
+class ErrorCode
+{
+    public static $OK = 0;
+    public static $IllegalAesKey = -41001;
+    public static $IllegalIv = -41002;
+    public static $IllegalBuffer = -41003;
+    public static $DecodeBase64Error = -41004;
+}
\ No newline at end of file
diff --git a/WeMini/crypt/wxBizDataCrypt.php b/WeMini/crypt/wxBizDataCrypt.php
new file mode 100644
index 0000000..d253e96
--- /dev/null
+++ b/WeMini/crypt/wxBizDataCrypt.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 对微信小程序用户加密数据的解密示例代码.
+ *
+ * @copyright Copyright (c) 1998-2014 Tencent Inc.
+ */
+
+include_once __DIR__ . DIRECTORY_SEPARATOR . "errorCode.php";
+
+class WXBizDataCrypt
+{
+    private $appid;
+    private $sessionKey;
+
+    /**
+     * 构造函数
+     * @param $sessionKey string 用户在小程序登录后获取的会话密钥
+     * @param $appid string 小程序的appid
+     */
+    public function __construct($appid, $sessionKey)
+    {
+        $this->appid = $appid;
+        $this->sessionKey = $sessionKey;
+    }
+
+    /**
+     * 检验数据的真实性，并且获取解密后的明文.
+     * @param $encryptedData string 加密的用户数据
+     * @param $iv string 与用户数据一同返回的初始向量
+     * @param $data string 解密后的原文
+     *
+     * @return int 成功0，失败返回对应的错误码
+     */
+    public function decryptData($encryptedData, $iv, &$data)
+    {
+        if (strlen($this->sessionKey) != 24) {
+            return \ErrorCode::$IllegalAesKey;
+        }
+        $aesKey = base64_decode($this->sessionKey);
+        if (strlen($iv) != 24) {
+            return \ErrorCode::$IllegalIv;
+        }
+        $aesIV = base64_decode($iv);
+        $aesCipher = base64_decode($encryptedData);
+        $result = openssl_decrypt($aesCipher, "AES-128-CBC", $aesKey, 1, $aesIV);
+        $dataObj = json_decode($result);
+        if ($dataObj == null) {
+            return \ErrorCode::$IllegalBuffer;
+        }
+        if ($dataObj->watermark->appid != $this->appid) {
+            return \ErrorCode::$IllegalBuffer;
+        }
+        $data = $result;
+        return \ErrorCode::$OK;
+    }
+
+}
+
diff --git a/composer.json b/composer.json
index c06a697..895e4e8 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
   },
   "autoload": {
     "psr-4": {
-      "WeChat\\": "WeChat"
+      "WeChat\\": "WeChat",
+      "WeMini\\": "WeMini"
     }
   }
 }
\ No newline at end of file
diff --git a/include.php b/include.php
index b8f402c..889d8c6 100644
--- a/include.php
+++ b/include.php
@@ -14,8 +14,14 @@
 
 // 动态注册SDK自动加载
 spl_autoload_register(function ($classname) {
-    $filename = __DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
-    if (stripos($classname, 'WeChat') === 0 && file_exists($filename)) {
-        include $filename;
+    $separator = DIRECTORY_SEPARATOR;
+    $filename = __DIR__ . $separator . str_replace('\\', $separator, $classname) . '.php';
+    if (file_exists($filename)) {
+        if (stripos($classname, 'WeChat') === 0) {
+            include $filename;
+        }
+        if (stripos($classname, 'WeMini') === 0) {
+            include $filename;
+        }
     }
 });
\ No newline at end of file

From a81f4bcf15f16015ae1973e35cfe11eb30c62d44 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 18 Apr 2018 17:45:02 +0800
Subject: [PATCH 006/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeMini/Crypt.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/WeMini/Crypt.php b/WeMini/Crypt.php
index 46fbad0..ece1b01 100644
--- a/WeMini/Crypt.php
+++ b/WeMini/Crypt.php
@@ -16,6 +16,8 @@ namespace WeMini;
 
 use WeChat\Contracts\BasicWeChat;
 
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'crypt' . DIRECTORY_SEPARATOR . 'wxBizDataCrypt.php';
+
 /**
  * 数据加密处理
  * Class Crypt
@@ -27,13 +29,12 @@ class Crypt extends BasicWeChat
     /**
      * 数据签名校验
      * @param string $iv
-     * @param string $encryptedData
      * @param string $sessionKey
+     * @param string $encryptedData
      * @return bool
      */
-    public function decode($iv, $encryptedData, $sessionKey)
+    public function decode($iv, $sessionKey, $encryptedData)
     {
-        require_once __DIR__ . DIRECTORY_SEPARATOR . 'wxBizDataCrypt.php';
         $pc = new \WXBizDataCrypt($this->config->get('appid'), $sessionKey);
         $errCode = $pc->decryptData($encryptedData, $iv, $data);
         if ($errCode == 0) {

From 2c57405e9731250331ac57216a8509947391b13f Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 15:00:44 +0800
Subject: [PATCH 007/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=A7=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeMini/Crypt.php                | 40 ++++++++++++++++++++++++++++++++-
 WeMini/crypt/wxBizDataCrypt.php |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/WeMini/Crypt.php b/WeMini/Crypt.php
index ece1b01..c593176 100644
--- a/WeMini/Crypt.php
+++ b/WeMini/Crypt.php
@@ -15,8 +15,10 @@
 namespace WeMini;
 
 use WeChat\Contracts\BasicWeChat;
+use WeChat\Contracts\Tools;
+use WeChat\Exceptions\InvalidDecryptException;
+use WeChat\Exceptions\InvalidResponseException;
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'crypt' . DIRECTORY_SEPARATOR . 'wxBizDataCrypt.php';
 
 /**
  * 数据加密处理
@@ -35,6 +37,7 @@ class Crypt extends BasicWeChat
      */
     public function decode($iv, $sessionKey, $encryptedData)
     {
+        require_once __DIR__ . DIRECTORY_SEPARATOR . 'crypt' . DIRECTORY_SEPARATOR . 'wxBizDataCrypt.php';
         $pc = new \WXBizDataCrypt($this->config->get('appid'), $sessionKey);
         $errCode = $pc->decryptData($encryptedData, $iv, $data);
         if ($errCode == 0) {
@@ -42,4 +45,39 @@ class Crypt extends BasicWeChat
         }
         return false;
     }
+
+    /**
+     * 登录凭证校验
+     * @param string $code 登录时获取的 code
+     * @return array
+     */
+    public function session($code)
+    {
+        $appid = $this->config->get('appid');
+        $secret = $this->config->get('appsecret');
+        $url = "https://api.weixin.qq.com/sns/jscode2session?appid={$appid}&secret={$secret}&js_code={$code}&grant_type=authorization_code";
+        return json_decode(Tools::get($url), true);
+    }
+
+    /**
+     * 换取用户信息
+     * @param string $code 用户登录凭证（有效期五分钟）
+     * @param string $iv 加密算法的初始向量
+     * @param string $encryptedData 加密数据( encryptedData )
+     * @return array
+     * @throws InvalidDecryptException
+     * @throws InvalidResponseException
+     */
+    public function userInfo($code, $iv, $encryptedData)
+    {
+        $result = $this->session($code);
+        if (empty($result['session_key'])) {
+            throw new InvalidResponseException('Code换取SessionKey失败', 403);
+        }
+        $userinfo = $this->decode($iv, $result['session_key'], $encryptedData);
+        if (empty($userinfo)) {
+            throw  new InvalidDecryptException('用户信息解析失败', 403);
+        }
+        return array_merge($result, $userinfo);
+    }
 }
\ No newline at end of file
diff --git a/WeMini/crypt/wxBizDataCrypt.php b/WeMini/crypt/wxBizDataCrypt.php
index d253e96..43769f2 100644
--- a/WeMini/crypt/wxBizDataCrypt.php
+++ b/WeMini/crypt/wxBizDataCrypt.php
@@ -6,7 +6,6 @@
  * @copyright Copyright (c) 1998-2014 Tencent Inc.
  */
 
-include_once __DIR__ . DIRECTORY_SEPARATOR . "errorCode.php";
 
 class WXBizDataCrypt
 {
@@ -22,6 +21,7 @@ class WXBizDataCrypt
     {
         $this->appid = $appid;
         $this->sessionKey = $sessionKey;
+        include_once __DIR__ . DIRECTORY_SEPARATOR . "errorCode.php";
     }
 
     /**

From d05c98099ef030528f5baf403e6f36019239f293 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 15:26:45 +0800
Subject: [PATCH 008/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=A7=A3=E7=A0=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/mini-login.php | 20 ++++++++++++++++++++
 WeMini/Crypt.php    |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 Test/mini-login.php

diff --git a/Test/mini-login.php b/Test/mini-login.php
new file mode 100644
index 0000000..2f3bab3
--- /dev/null
+++ b/Test/mini-login.php
@@ -0,0 +1,20 @@
+<?php
+
+include '../include.php';
+
+// 小程序配置
+$config = [
+    'appid'     => 'wx6bb7b70258da09c6',
+    'appsecret' => '78b7b8d65bd67b078babf951d4342b42',
+];
+
+// 解码数据
+$iv = 'ltM/wT7hsAl0TijEBI4v/g==';
+$code = '013LyiTR0TwjC92QjJRR0mEsTR0LyiT3';
+$decode = 'eIoVtIC2YzLCnrwiIs1IBbXMvC0vyL8bo1IhD38fUQIRbk3lgTWa0Hdw/Ty7NTs3iu7YlqqZBti+cxd6dCfeXBUQwTO2QpbHg0WTeDAdrihsHRHm4dCWdfTx8rzDloGbNOIsKdRElIhUH5YFdiTr5AYiufUDb34cwJ4GNWLAUq4bR0dmFeVEi+3nfwe2MAjGYDl4aq719VLsHodOggK6lXZvM5wjoDyuZsK2dPqJr3/Ji30Z0mdyFq32R4uR3rtJH/h+Rj0+/QmE9QYG7Y6Z48hgPE8cpnhRQNwH49jnC/zKZ9wtDkQ/J8J3Ed2i58zcuY01v8IV+pZ8oBUKXfO5ha+APOxtBSTzyHraU/2RGo8UWtOF6h64OQZhd/UQQy362eyc/qoq8sF9JnEFRP0mRmTDJ+u9oyDhxswCu6x8V73ERWaJeEGSCyjiGpep7/DxZ6eSSBq36OB0BWBkJqsq9Q==';
+$sessionKey = 'OetNxl86B/yMpbwG6wtMEw==';
+$mini = new WeMini\Crypt($config);
+echo '<pre>';
+//print_r($mini->session($code));
+print_r($mini->decode($iv, $sessionKey, $decode));
+//print_r($mini->userInfo($code, $iv, $decode));
\ No newline at end of file
diff --git a/WeMini/Crypt.php b/WeMini/Crypt.php
index c593176..70081ed 100644
--- a/WeMini/Crypt.php
+++ b/WeMini/Crypt.php
@@ -41,7 +41,7 @@ class Crypt extends BasicWeChat
         $pc = new \WXBizDataCrypt($this->config->get('appid'), $sessionKey);
         $errCode = $pc->decryptData($encryptedData, $iv, $data);
         if ($errCode == 0) {
-            return $data;
+            return json_decode($data, true);
         }
         return false;
     }
@@ -72,7 +72,7 @@ class Crypt extends BasicWeChat
     {
         $result = $this->session($code);
         if (empty($result['session_key'])) {
-            throw new InvalidResponseException('Code换取SessionKey失败', 403);
+            throw new InvalidResponseException('Code 换取 SessionKey 失败', 403);
         }
         $userinfo = $this->decode($iv, $result['session_key'], $encryptedData);
         if (empty($userinfo)) {

From d937eab94ba62ebcb08a79aaad6f65838c7dc872 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 15:59:20 +0800
Subject: [PATCH 009/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/mini-qrc.php                | 20 ++++++++++++++++++++
 WeChat/Contracts/BasicWeChat.php |  7 +++++--
 WeMini/Qrcode.php                | 22 +++++++++++++---------
 3 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 Test/mini-qrc.php

diff --git a/Test/mini-qrc.php b/Test/mini-qrc.php
new file mode 100644
index 0000000..55c43dd
--- /dev/null
+++ b/Test/mini-qrc.php
@@ -0,0 +1,20 @@
+<?php
+
+include '../include.php';
+
+// 小程序配置
+$config = [
+    'appid'     => 'wx6bb7b70258da09c6',
+    'appsecret' => '78b7b8d65bd67b078babf951d4342b42',
+];
+
+$mini = new WeMini\Qrcode($config);
+
+echo '<pre>';
+try {
+//    var_dump($mini->getCode('pages/index?query=1'));
+//    var_dump($mini->getCodeUnlimit('432432', 'pages/index/index'));
+//    var_dump($mini->createQrcode('pages/index?query=1'));
+} catch (Exception $e) {
+    var_dump($e->getMessage());
+}
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 2ec029f..1af8ceb 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -122,6 +122,7 @@ class BasicWeChat
      * 以GET获取接口数据并转为数组
      * @param string $url 接口地址
      * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
      */
     protected function httpGetForJson($url)
     {
@@ -133,6 +134,7 @@ class BasicWeChat
                 $this->isTry = true;
                 return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
             }
+            throw new InvalidResponseException($e->getMessage(), $e->getCode());
         }
     }
 
@@ -142,6 +144,7 @@ class BasicWeChat
      * @param array $data 请求数据
      * @param bool $buildToJson
      * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
      */
     protected function httpPostForJson($url, array $data, $buildToJson = true)
     {
@@ -149,10 +152,10 @@ class BasicWeChat
             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'])) {
-                $this->delAccessToken();
-                $this->isTry = true;
+                [$this->delAccessToken(), $this->isTry = true];
                 return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
             }
+            throw new InvalidResponseException($e->getMessage(), $e->getCode());
         }
     }
 
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index 217d4d5..7fec035 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -15,6 +15,7 @@
 namespace WeMini;
 
 use WeChat\Contracts\BasicWeChat;
+use WeChat\Contracts\Tools;
 
 /**
  * 微信小程序二维码管理
@@ -31,16 +32,17 @@ class Qrcode extends BasicWeChat
      * @param integer $width 二维码的宽度
      * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
      * @param array $line_color auto_color 为 false 时生效
-     * @return array
+     * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function getCode($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
     {
-        $url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN';
+        $url = 'https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        $data = ['path' => $path, 'width' => $width, 'auto_color' => false, 'line_color' => $line_color];
-        return $this->callPostApi($url, $data, true);
+        $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color];
+        $result = Tools::post($url, Tools::arr2json($data));
+        return strlen($result) > 256 ? $result : Tools::json2arr($result);
     }
 
     /**
@@ -51,16 +53,17 @@ class Qrcode extends BasicWeChat
      * @param integer $width 二维码的宽度
      * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
      * @param array $line_color auto_color 为 false 时生效
-     * @return array
+     * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function getCodeUnlimit($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
     {
         $url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN';
+        $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color];
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        $data = ['scene' => $scene, 'width' => $width, 'auto_color' => false, 'line_color' => $line_color];
-        return $this->callPostApi($url, $data, true);
+        $result = Tools::post($url, Tools::arr2json($data));
+        return strlen($result) > 256 ? $result : Tools::json2arr($result);
     }
 
     /**
@@ -68,7 +71,7 @@ class Qrcode extends BasicWeChat
      * 接口C：适用于需要的码数量较少的业务场景
      * @param string $path 不能为空，最大长度 128 字节
      * @param integer $width 二维码的宽度
-     * @return array
+     * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
@@ -76,7 +79,8 @@ class Qrcode extends BasicWeChat
     {
         $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->callPostApi($url, ['path' => $path, 'width' => $width], true);
+        $result = Tools::post($url, Tools::arr2json(['path' => urlencode($path), 'width' => $width]));
+        return strlen($result) > 256 ? $result : Tools::json2arr($result);
     }
 
 }
\ No newline at end of file

From a89b7fc761942720771a42408479cb9992388d57 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 16:04:14 +0800
Subject: [PATCH 010/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeMini/Plugs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeMini/Plugs.php b/WeMini/Plugs.php
index 8546fbf..4755ff1 100644
--- a/WeMini/Plugs.php
+++ b/WeMini/Plugs.php
@@ -61,7 +61,7 @@ class Plugs extends BasicWeChat
     {
         $url = 'https://api.weixin.qq.com/wxa/plugin?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->callPostApi($url, ['action' => 'list', 'plugin_appid' => $plugin_appid], true);
+        return $this->callPostApi($url, ['action' => 'unbind', 'plugin_appid' => $plugin_appid], true);
     }
 
 

From 6c528089c8a756c7a6c139e3c7994189ba7d9d03 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 17:26:22 +0800
Subject: [PATCH 011/161] =?UTF-8?q?[=E8=B0=83=E6=95=B4]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=BC=93=E5=AD=98=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 0bc5949..4cfe9b8 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -306,7 +306,7 @@ class Tools
     private static function getCacheName($name)
     {
         if (empty(self::$cache_path)) {
-            self::$cache_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
+            self::$cache_path = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
         }
         self::$cache_path = rtrim(self::$cache_path, '/\\') . DIRECTORY_SEPARATOR;
         file_exists(self::$cache_path) || mkdir(self::$cache_path, 0755, true);

From 3cf5bfac8f59315fed4f2e87f135bd240b1dd3b1 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 17:46:18 +0800
Subject: [PATCH 012/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index b0036c3..3a063cb 100644
--- a/README.md
+++ b/README.md
@@ -16,20 +16,20 @@ PHP开发技术交流（QQ群 513350915）
 
 [![PHP微信开发群 (SDK)](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a) 
 
-> WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先阅读微信官方文档。
->* 微信官方文档：http://mp.weixin.qq.com/wiki
->* 商户支付文档：https://pay.weixin.qq.com/wiki/doc/api/index.html
+WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先阅读微信官方文档。
+* 微信官方文档：https://mp.weixin.qq.com/wiki
+* 商户支付文档：https://pay.weixin.qq.com/wiki/doc/api/index.html
 
-> 针对 WeChatDeveloper 也有一准备了帮助资料可供参考。
->* 开发文档地址：http://www.kancloud.cn/zoujingli/wechat-developer
->* Think.Admin：https://github.com/zoujingli/Think.Admin
+针对 WeChatDeveloper 也有一准备了帮助资料可供参考。
+* ThinkAdmin：https://github.com/zoujingli/Think.Admin
+* 开发文档地址：https://www.kancloud.cn/zoujingli/wechat-developer
 
 
 Repositorie
 --
- WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。
->* GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
->* OSChina 托管地址：http://git.oschina.net/zoujingli/WeChatDeveloper
+WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。
+* Gitee 托管地址：https://gitee.com/zoujingli/WeChatDeveloper
+* GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
 
 
 Install
@@ -39,7 +39,7 @@ Install
 # 首次安装 线上版本（稳定）
 composer require zoujingli/wechat-developer
 
-# 首次安装 开发版本 
+# 首次安装 开发版本 （开发）
 composer require zoujingli/wechat-developer dev-master
 
 # 更新 WeChatDeveloper

From e434398f733ac325002a7abda0dcfb679a88bfd7 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 17:48:49 +0800
Subject: [PATCH 013/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index 3a063cb..909c787 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Install
 # 首次安装 线上版本（稳定）
 composer require zoujingli/wechat-developer
 
-# 首次安装 开发版本 （开发）
+# 首次安装 开发版本（开发）
 composer require zoujingli/wechat-developer dev-master
 
 # 更新 WeChatDeveloper

From 9e6e0a9aec69a63b04ac593ebb156d9a8a3e8fb0 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 17:52:31 +0800
Subject: [PATCH 014/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BF=BD=E7=95=A5=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore        | 2 +-
 Test/mini-qrc.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 394867f..09de8bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 /.git
 /.DS_Store
 /vendor
-/WeChat/Cache
+/Cache
diff --git a/Test/mini-qrc.php b/Test/mini-qrc.php
index 55c43dd..380785b 100644
--- a/Test/mini-qrc.php
+++ b/Test/mini-qrc.php
@@ -14,7 +14,7 @@ echo '<pre>';
 try {
 //    var_dump($mini->getCode('pages/index?query=1'));
 //    var_dump($mini->getCodeUnlimit('432432', 'pages/index/index'));
-//    var_dump($mini->createQrcode('pages/index?query=1'));
+    var_dump($mini->createQrcode('pages/index?query=1'));
 } catch (Exception $e) {
     var_dump($e->getMessage());
 }

From d0877f695a45a911a4a40b6ef8e59e5c261c1b6c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 19 Apr 2018 18:18:10 +0800
Subject: [PATCH 015/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/mini-qrc.php | 9 +++++----
 WeMini/Qrcode.php | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Test/mini-qrc.php b/Test/mini-qrc.php
index 380785b..f636610 100644
--- a/Test/mini-qrc.php
+++ b/Test/mini-qrc.php
@@ -10,11 +10,12 @@ $config = [
 
 $mini = new WeMini\Qrcode($config);
 
-echo '<pre>';
+//echo '<pre>';
 try {
-//    var_dump($mini->getCode('pages/index?query=1'));
-//    var_dump($mini->getCodeUnlimit('432432', 'pages/index/index'));
-    var_dump($mini->createQrcode('pages/index?query=1'));
+    header('Content-type:image/jpeg');//输出的类型
+//    echo $mini->createDefault('pages/index?query=1');
+//    echo $mini->createMiniScene('432432', 'pages/index/index');
+    echo $mini->createMiniPath('pages/index?query=1');
 } catch (Exception $e) {
     var_dump($e->getMessage());
 }
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index 7fec035..e8252e3 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -36,7 +36,7 @@ class Qrcode extends BasicWeChat
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function getCode($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
+    public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
     {
         $url = 'https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
@@ -57,7 +57,7 @@ class Qrcode extends BasicWeChat
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function getCodeUnlimit($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
+    public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
     {
         $url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN';
         $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color];
@@ -75,11 +75,11 @@ class Qrcode extends BasicWeChat
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function createQrcode($path, $width = 430)
+    public function createDefault($path, $width = 430)
     {
         $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        $result = Tools::post($url, Tools::arr2json(['path' => urlencode($path), 'width' => $width]));
+        $result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width]));
         return strlen($result) > 256 ? $result : Tools::json2arr($result);
     }
 

From 68cc814ad3e58bbfe21635f5c7fd8a90ca662146 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 2 May 2018 10:16:53 +0800
Subject: [PATCH 016/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0J?=
 =?UTF-8?q?sApi=E5=8F=8AH5=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=96=B9=E6=B3=95=20createParamsForJsApi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index f5c4ab9..3e65f7b 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -78,6 +78,25 @@ class Pay
         return $this->callPostApi($url, $options);
     }
 
+
+    /**
+     * 创建JsApi及H5支付参数
+     * @param string $prepay_id 统一下单预支付码
+     * @return array
+     */
+    public function createParamsForJsApi($prepay_id)
+    {
+        $option = [];
+        $option["appId"] = $this->config->get('appid');
+        $option["timeStamp"] = (string)time();
+        $option["nonceStr"] = Tools::createNoncestr();
+        $option["package"] = "prepay_id={$prepay_id}";
+        $option["signType"] = "MD5";
+        $option["paySign"] = $this->getPaySign($option, 'MD5');
+        $option['timestamp'] = $option['timeStamp'];
+        return $option;
+    }
+
     /**
      * 查询订单
      * @param array $options

From 8a2030216b066b78b7b89505f2ee33fe679d54dc Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 2 May 2018 10:22:46 +0800
Subject: [PATCH 017/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E8=A7=84=E5=88=99=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 3e65f7b..efb3203 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -97,6 +97,24 @@ class Pay
         return $option;
     }
 
+    /**
+     * 获取支付规则二维码
+     * @param string $product_id 商户定义的商品id 或者订单号
+     * @return string
+     */
+    public function createParamsForRuleQrc($product_id)
+    {
+        $data = [
+            'appid'      => $this->config->get('appid'),
+            'mch_id'     => $this->config->get('mch_id'),
+            'time_stamp' => (string)time(),
+            'nonce_str'  => Tools::createNoncestr(),
+            'product_id' => (string)$product_id,
+        ];
+        $data['sign'] = $this->getPaySign($data, 'MD5');
+        return "weixin://wxpay/bizpayurl?" . http_build_query($data);
+    }
+
     /**
      * 查询订单
      * @param array $options

From ecf3841ab093865dda76acd1cf7fe59d3d07c5ad Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 2 May 2018 10:48:20 +0800
Subject: [PATCH 018/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index 909c787..90e23bb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Latest Stable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/stable)](https://packagist.org/packages/wechat-developer) [![Latest Unstable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/unstable)](https://packagist.org/packages/zoujingli/wechat-developer) [![Total Downloads](https://poser.pugx.org/zoujingli/wechat-developer/downloads)](https://packagist.org/packages/wechat-developer) [![License](https://poser.pugx.org/zoujingli/wechat-developer/license)](https://packagist.org/packages/wechat-developer)
+[![Latest Stable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/stable)](https://packagist.org/packages/zoujingli/wechat-developer) [![Latest Unstable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/unstable)](https://packagist.org/packages/zoujingli/wechat-developer) [![Total Downloads](https://poser.pugx.org/zoujingli/wechat-developer/downloads)](https://packagist.org/packages/wechat-developer) [![License](https://poser.pugx.org/zoujingli/wechat-developer/license)](https://packagist.org/packages/wechat-developer)
 
 WeChatDeveloper for PHP
 --

From 4b1112e8d4723ce5e6ef0d6eee41a02e588b60ab Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 3 May 2018 15:30:54 +0800
Subject: [PATCH 019/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/pay-order-create.php |  8 ++++++++
 WeChat/Pay.php            | 23 +++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Test/pay-order-create.php b/Test/pay-order-create.php
index 9d4b5e7..e130bb1 100644
--- a/Test/pay-order-create.php
+++ b/Test/pay-order-create.php
@@ -33,10 +33,18 @@ try {
         'notify_url'       => 'http://a.com/text.html',
         'spbill_create_ip' => '127.0.0.1',
     ];
+    // 生成预支付码
     $result = $wechat->createOrder($options);
+    // 创建JSAPI参数签名
+    $options = $wechat->createParamsForJsApi($result['prepay_id']);
 
+    echo '<pre>';
+    echo "\n--- 创建预支付码 ---\n";
     var_export($result);
 
+    echo "\n\n--- JSAPI 及 H5 参数 ---\n";
+    var_export($options);
+
 } catch (Exception $e) {
 
     // 出错啦，处理下吧
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index efb3203..5b4c6df 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -75,7 +75,7 @@ class Pay
     public function createOrder(array $options)
     {
         $url = 'https://api.mch.weixin.qq.com/pay/unifiedorder';
-        return $this->callPostApi($url, $options);
+        return $this->callPostApi($url, $options, false, 'MD5');
     }
 
 
@@ -266,22 +266,23 @@ class Pay
 
     /**
      * 生成支付签名
-     * @param array $data
-     * @param string $signType
+     * @param array $data 参与签名的数据
+     * @param string $signType 参与签名的类型
+     * @param string $buff 参与签名字符串前缀
      * @return string
      */
-    public function getPaySign(array $data, $signType = 'MD5')
+    public function getPaySign(array $data, $signType = 'MD5', $buff = '')
     {
         unset($data['sign']);
         ksort($data);
-        list($key, $str) = [$this->config->get('mch_key'), ''];
         foreach ($data as $k => $v) {
-            $str .= "{$k}={$v}&";
+            $buff .= "{$k}={$v}&";
         }
-        if ($signType === 'MD5') {
-            return strtoupper(md5("{$str}key={$key}"));
+        $buff .= ("key=" . $this->config->get('mch_key'));
+        if (strtoupper($signType) === 'MD5') {
+            return strtoupper(md5($buff));
         }
-        return strtoupper(hash_hmac('SHA256', "{$str}key={$key}", $key));
+        return strtoupper(hash_hmac('SHA256', $buff, $this->config->get('mch_key')));
     }
 
     /**
@@ -307,9 +308,7 @@ class Pay
             $option['ssl_key'] = $this->config->get('ssl_key');
         }
         $params = $this->params->merge($data);
-        if ($needSignType) {
-            $params['sign_type'] = strtoupper($signType);
-        }
+        $needSignType && ($params['sign_type'] = strtoupper($signType));
         $params['sign'] = $this->getPaySign($params, $signType);
         $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
         if ($result['return_code'] !== 'SUCCESS') {

From a0c5263fd7e01b194bdbb816a0c1c2ec49e4d045 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 8 May 2018 10:38:53 +0800
Subject: [PATCH 020/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E8=8E=B7=E5=8F=96accessToken=E6=9C=AA?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E5=88=B0$this->access=5Ftoken=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 1af8ceb..83c9a3d 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -105,7 +105,7 @@ class BasicWeChat
         if (!empty($result['access_token'])) {
             Tools::setCache($cache, $result['access_token'], 7000);
         }
-        return $result['access_token'];
+        return $this->access_token = $result['access_token'];
     }
 
     /**

From 011e4608726fa83cb495dfa1f4d4f56c154ada21 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 9 May 2018 12:22:21 +0800
Subject: [PATCH 021/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=AF=81=E4=B9=A6=E9=85=8D=E7=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 5b4c6df..fddcf1c 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -300,7 +300,7 @@ class Pay
         $option = [];
         if ($isCert) {
             foreach (['ssl_cer', 'ssl_key'] as $key) {
-                if (empty($options[$key])) {
+                if (empty($option[$key])) {
                     throw new InvalidArgumentException("Missing Config -- [{$key}]", '0');
                 }
             }

From e72fb2f166ee1a3b4889845cd932a1ab9d2005ee Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 9 May 2018 13:38:00 +0800
Subject: [PATCH 022/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=9B=AE=E5=BD=95=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index fddcf1c..b57d43b 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -299,13 +299,13 @@ class Pay
     {
         $option = [];
         if ($isCert) {
+            $option['ssl_cer'] = $this->config->get('ssl_cer');
+            $option['ssl_key'] = $this->config->get('ssl_key');
             foreach (['ssl_cer', 'ssl_key'] as $key) {
-                if (empty($option[$key])) {
+                if (empty($option[$key]) || !file_exists($option[$key])) {
                     throw new InvalidArgumentException("Missing Config -- [{$key}]", '0');
                 }
             }
-            $option['ssl_cer'] = $this->config->get('ssl_cer');
-            $option['ssl_key'] = $this->config->get('ssl_key');
         }
         $params = $this->params->merge($data);
         $needSignType && ($params['sign_type'] = strtoupper($signType));

From a3e6c0cd22da676cc351fad26e436f7f95d3c07d Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 10 May 2018 18:28:26 +0800
Subject: [PATCH 023/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=B4=A0=E6=9D=90?=
 =?UTF-8?q?=E4=BA=8C=E8=BF=9B=E5=88=B6=E6=96=87=E4=BB=B6=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BE=93=E5=87=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Media.php  | 22 ++++++++++++++++------
 WeMini/Qrcode.php | 24 ++++++++++++++++++------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/WeChat/Media.php b/WeChat/Media.php
index 7dd8511..684b568 100644
--- a/WeChat/Media.php
+++ b/WeChat/Media.php
@@ -46,15 +46,20 @@ class Media extends BasicWeChat
     /**
      * 获取临时素材
      * @param string $media_id
-     * @return bool|string
+     * @param string $outType 返回处理函数
+     * @return array|string
      * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
-    public function get($media_id)
+    public function get($media_id, $outType = null)
     {
         $url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id={$media_id}";
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return Tools::get($url);
+        $result = Tools::get($url);
+        if (($json = Tools::json2arr($result))) {
+            return $json;
+        }
+        return is_null($outType) ? $result : $outType($result);
     }
 
     /**
@@ -124,15 +129,20 @@ class Media extends BasicWeChat
     /**
      * 获取永久素材
      * @param string $media_id
-     * @return array
+     * @param null|string $outType 输出类型
+     * @return array|string
      * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
-    public function getMaterial($media_id)
+    public function getMaterial($media_id, $outType = null)
     {
         $url = "https://api.weixin.qq.com/cgi-bin/material/get_material?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        return $this->httpPostForJson($url, ['media_id' => $media_id]);
+        $result = Tools::post($url, ['media_id' => $media_id]);
+        if (($json = Tools::json2arr($result))) {
+            return $json;
+        }
+        return is_null($outType) ? $result : $outType($result);
     }
 
     /**
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index e8252e3..aa70129 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -32,17 +32,21 @@ class Qrcode extends BasicWeChat
      * @param integer $width 二维码的宽度
      * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
      * @param array $line_color auto_color 为 false 时生效
+     * @param null|string $outType 输出类型
      * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
+    public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $outType = null)
     {
         $url = 'https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color];
         $result = Tools::post($url, Tools::arr2json($data));
-        return strlen($result) > 256 ? $result : Tools::json2arr($result);
+        if (($json = Tools::json2arr($result))) {
+            return $json;
+        }
+        return is_null($outType) ? $result : $outType($result);
     }
 
     /**
@@ -53,17 +57,21 @@ class Qrcode extends BasicWeChat
      * @param integer $width 二维码的宽度
      * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
      * @param array $line_color auto_color 为 false 时生效
+     * @param null|string $outType 输出类型
      * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"])
+    public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $outType = null)
     {
         $url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN';
         $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color];
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json($data));
-        return strlen($result) > 256 ? $result : Tools::json2arr($result);
+        if (($json = Tools::json2arr($result))) {
+            return $json;
+        }
+        return is_null($outType) ? $result : $outType($result);
     }
 
     /**
@@ -71,16 +79,20 @@ class Qrcode extends BasicWeChat
      * 接口C：适用于需要的码数量较少的业务场景
      * @param string $path 不能为空，最大长度 128 字节
      * @param integer $width 二维码的宽度
+     * @param null|string $outType 输出类型
      * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function createDefault($path, $width = 430)
+    public function createDefault($path, $width = 430, $outType = null)
     {
         $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width]));
-        return strlen($result) > 256 ? $result : Tools::json2arr($result);
+        if (($json = Tools::json2arr($result))) {
+            return $json;
+        }
+        return is_null($outType) ? $result : $outType($result);
     }
 
 }
\ No newline at end of file

From 4598856a9e19c81f76f7f7076c80acff8dc67644 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 10 May 2018 18:34:26 +0800
Subject: [PATCH 024/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=B4=A0=E6=9D=90?=
 =?UTF-8?q?=E4=BA=8C=E8=BF=9B=E5=88=B6=E6=96=87=E4=BB=B6=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BE=93=E5=87=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Media.php  |  8 ++++----
 WeMini/Qrcode.php | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WeChat/Media.php b/WeChat/Media.php
index 684b568..33f9a69 100644
--- a/WeChat/Media.php
+++ b/WeChat/Media.php
@@ -56,8 +56,8 @@ class Media extends BasicWeChat
         $url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id={$media_id}";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::get($url);
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }
@@ -139,8 +139,8 @@ class Media extends BasicWeChat
         $url = "https://api.weixin.qq.com/cgi-bin/material/get_material?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, ['media_id' => $media_id]);
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index aa70129..a271712 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -43,8 +43,8 @@ class Qrcode extends BasicWeChat
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color];
         $result = Tools::post($url, Tools::arr2json($data));
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }
@@ -68,8 +68,8 @@ class Qrcode extends BasicWeChat
         $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color];
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json($data));
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }
@@ -89,8 +89,8 @@ class Qrcode extends BasicWeChat
         $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width]));
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }

From 9ed8e1da4bb201efa1a2fc3ec08a2c29e82c8905 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 16:14:35 +0800
Subject: [PATCH 025/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/pay-transfers-create.php | 44 +++++++++++++++++++++++++++++++++++
 WeChat/Pay.php                |  4 ++++
 2 files changed, 48 insertions(+)
 create mode 100644 Test/pay-transfers-create.php

diff --git a/Test/pay-transfers-create.php b/Test/pay-transfers-create.php
new file mode 100644
index 0000000..e91a60e
--- /dev/null
+++ b/Test/pay-transfers-create.php
@@ -0,0 +1,44 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+try {
+
+    // 1. 手动加载入口文件
+    include "../include.php";
+
+    // 2. 准备公众号配置参数
+    $config = include "./config.php";
+
+    // 3. 创建接口实例
+    $wechat = new \WeChat\Pay($config);
+
+    // 4. 组装参数，可以参考官方商户文档
+    $options = [
+        'partner_trade_no' => '1008450740201411110005820873',
+        'openid'           => '商户退款单号',
+        'check_name'       => 'NO_CHECK',
+        'amount'           => '100',
+        'desc'             => '企业付款操作说明信息',
+        'spbill_create_ip' => '127.0.0.1',
+    ];
+    $result = $wechat->createTransfers($options);
+
+    var_export($result);
+
+} catch (Exception $e) {
+
+    // 出错啦，处理下吧
+    echo $e->getMessage() . PHP_EOL;
+
+}
\ No newline at end of file
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index b57d43b..00f4ff1 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -232,6 +232,10 @@ class Pay
      */
     public function createTransfers(array $options)
     {
+        $this->params->set('mchid', $this->config->get('mch_id'));
+        $this->params->set('mch_appid', $this->config->get('appid'));
+        $this->params->offsetUnset('appid');
+        $this->params->offsetUnset('mch_id');
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers';
         return $this->callPostApi($url, $options, true, 'MD5', false);
     }

From d703bd7dd3498e516b11d98c6f5b67587b64c3cc Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 16:21:47 +0800
Subject: [PATCH 026/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95demo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/pay-transfers-create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Test/pay-transfers-create.php b/Test/pay-transfers-create.php
index e91a60e..3fedb36 100644
--- a/Test/pay-transfers-create.php
+++ b/Test/pay-transfers-create.php
@@ -26,7 +26,7 @@ try {
     // 4. 组装参数，可以参考官方商户文档
     $options = [
         'partner_trade_no' => '1008450740201411110005820873',
-        'openid'           => '商户退款单号',
+        'openid'           => '用户的openid',
         'check_name'       => 'NO_CHECK',
         'amount'           => '100',
         'desc'             => '企业付款操作说明信息',

From a5ea49236bf9d5250fb91ab7076f61b69b0022a9 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 16:50:12 +0800
Subject: [PATCH 027/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Menu.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WeChat/Menu.php b/WeChat/Menu.php
index 8e8fe4e..c006a8e 100644
--- a/WeChat/Menu.php
+++ b/WeChat/Menu.php
@@ -59,9 +59,6 @@ class Menu extends BasicWeChat
      */
     public function create(array $data)
     {
-        try {
-        } catch (\Exception $e) {
-        }
         $url = "https://api.weixin.qq.com/cgi-bin/menu/create?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->httpPostForJson($url, $data);

From fc79380f0d368df8e17c769a3f75a28275561911 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 17:13:59 +0800
Subject: [PATCH 028/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Test/config.php b/Test/config.php
index 9825b59..3c3eb82 100644
--- a/Test/config.php
+++ b/Test/config.php
@@ -19,7 +19,7 @@ return [
     'encodingaeskey' => 'BJIUzE0gqlWy0GxfPp4J1oPTBmOrNDIGPNav1YFH5Z5',
     // 配置商户支付参数
     'mch_id'         => "1332187001",
-    'mch_key'        => '11bd3d66d85f322a1e803cb587d18c3f',
+    'mch_key'        => 'A82DC5BD1F3359081049C568D8502BC5',
     // 配置商户支付双向证书目录
     'ssl_key'        => '',
     'ssl_cer'        => '',

From 83f30ceed8e54d83803175e281fa1127405209c3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 17:23:49 +0800
Subject: [PATCH 029/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                    | 1 +
 Test/config.php               | 4 ++--
 Test/pay-transfers-create.php | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 09de8bb..1d2b80a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /.DS_Store
 /vendor
 /Cache
+/Test/cert
diff --git a/Test/config.php b/Test/config.php
index 3c3eb82..48fdd4a 100644
--- a/Test/config.php
+++ b/Test/config.php
@@ -21,8 +21,8 @@ return [
     'mch_id'         => "1332187001",
     'mch_key'        => 'A82DC5BD1F3359081049C568D8502BC5',
     // 配置商户支付双向证书目录
-    'ssl_key'        => '',
-    'ssl_cer'        => '',
+    'ssl_key'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_key.pem',
+    'ssl_cer'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.pem',
     // 配置缓存目录，需要拥有写权限
     'cache_path'     => '',
 ];
\ No newline at end of file
diff --git a/Test/pay-transfers-create.php b/Test/pay-transfers-create.php
index 3fedb36..7e4735c 100644
--- a/Test/pay-transfers-create.php
+++ b/Test/pay-transfers-create.php
@@ -25,15 +25,15 @@ try {
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
-        'partner_trade_no' => '1008450740201411110005820873',
-        'openid'           => '用户的openid',
+        'partner_trade_no' => time(),
+        'openid'           => 'o38gps3vNdCqaggFfrBRCRikwlWY',
         'check_name'       => 'NO_CHECK',
         'amount'           => '100',
         'desc'             => '企业付款操作说明信息',
         'spbill_create_ip' => '127.0.0.1',
     ];
     $result = $wechat->createTransfers($options);
-
+    echo '<pre>';
     var_export($result);
 
 } catch (Exception $e) {

From 095471bdc61e3389135f69b1849069c19d439f22 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 17:54:48 +0800
Subject: [PATCH 030/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E5=88=B0=E9=93=B6=E8=A1=8C?=
 =?UTF-8?q?=E5=8D=A1=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/pay-transfersbank-create.php |  44 +++++++++++++
 WeChat/Pay.php                    | 104 ++++++++++++++++++++++++++++--
 2 files changed, 142 insertions(+), 6 deletions(-)
 create mode 100644 Test/pay-transfersbank-create.php

diff --git a/Test/pay-transfersbank-create.php b/Test/pay-transfersbank-create.php
new file mode 100644
index 0000000..92147af
--- /dev/null
+++ b/Test/pay-transfersbank-create.php
@@ -0,0 +1,44 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+try {
+
+    // 1. 手动加载入口文件
+    include "../include.php";
+
+    // 2. 准备公众号配置参数
+    $config = include "./config.php";
+
+    // 3. 创建接口实例
+    $wechat = new \WeChat\Pay($config);
+
+    // 4. 组装参数，可以参考官方商户文档
+    $options = [
+        'partner_trade_no' => time(),
+        'enc_bank_no'      => '6212263602037318102',
+        'enc_true_name'    => '邹景立',
+        'bank_code'        => '1002',
+        'amount'           => '100',
+        'desc'             => '打款测试',
+    ];
+    echo '<pre>';
+    $result = $wechat->createTransfersBank($options);
+    var_export($result);
+
+} catch (Exception $e) {
+
+    // 出错啦，处理下吧
+    echo $e->getMessage() . PHP_EOL;
+
+}
\ No newline at end of file
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 00f4ff1..5af3416 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -17,6 +17,7 @@ namespace WeChat;
 use WeChat\Contracts\DataArray;
 use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidArgumentException;
+use WeChat\Exceptions\InvalidDecryptException;
 use WeChat\Exceptions\InvalidResponseException;
 
 /**
@@ -228,7 +229,7 @@ class Pay
      * 企业付款到零钱
      * @param array $options
      * @return array
-     * @throws InvalidResponseException
+     * @throws Exceptions\InvalidResponseException
      */
     public function createTransfers(array $options)
     {
@@ -252,6 +253,98 @@ class Pay
         return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
     }
 
+    /**
+     * 企业付款到银行卡
+     * @param array $options
+     * @return array
+     * @throws Exceptions\LocalCacheException
+     * @throws Exceptions\InvalidDecryptException
+     * @throws Exceptions\InvalidResponseException
+     */
+    public function createTransfersBank(array $options)
+    {
+        if (!isset($options['partner_trade_no'])) {
+            throw new InvalidArgumentException('Missing Options -- [partner_trade_no]');
+        }
+        if (!isset($options['enc_bank_no'])) {
+            throw new InvalidArgumentException('Missing Options -- [enc_bank_no]');
+        }
+        if (!isset($options['enc_true_name'])) {
+            throw new InvalidArgumentException('Missing Options -- [enc_true_name]');
+        }
+        if (!isset($options['bank_code'])) {
+            throw new InvalidArgumentException('Missing Options -- [bank_code]');
+        }
+        if (!isset($options['amount'])) {
+            throw new InvalidArgumentException('Missing Options -- [amount]');
+        }
+        isset($options['desc']) && $this->config['desc'] = $options['desc'];
+        $this->params->offsetUnset('appid');
+        return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
+            'amount'           => $options['amount'],
+            'bank_code'        => $options['bank_code'],
+            'partner_trade_no' => $options['partner_trade_no'],
+            'enc_bank_no'      => $this->rsaEncode($options['enc_bank_no']),
+            'enc_true_name'    => $this->rsaEncode($options['enc_true_name']),
+        ], true, 'MD5', false);
+    }
+
+    /**
+     * 商户企业付款到银行卡操作进行结果查询
+     * @param string $partner_trade_no 商户订单号，需保持唯一
+     * @return array
+     * @throws InvalidResponseException
+     */
+    public function queryTransFresBank($partner_trade_no)
+    {
+        $url = 'https://api.mch.weixin.qq.com/mmpaysptrans/query_bank';
+        return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
+    }
+
+    /**
+     * RSA加密处理
+     * @param string $string
+     * @param string $encrypted
+     * @return string
+     * @throws Exceptions\LocalCacheException
+     * @throws Exceptions\InvalidDecryptException
+     * @throws Exceptions\InvalidResponseException
+     */
+    private function rsaEncode($string, $encrypted = '')
+    {
+        $search = ['-----BEGIN RSA PUBLIC KEY-----', '-----END RSA PUBLIC KEY-----', "\n", "\r"];
+        $pkc1 = str_replace($search, '', $this->getRsaContent());
+        $publicKey = '-----BEGIN PUBLIC KEY-----' . PHP_EOL .
+            wordwrap('MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A' . $pkc1, 64, PHP_EOL, true) . PHP_EOL .
+            '-----END PUBLIC KEY-----';
+        if (!openssl_public_encrypt("{$string}", $encrypted, $publicKey, OPENSSL_PKCS1_OAEP_PADDING)) {
+            throw new InvalidDecryptException('Rsa Encrypt Error.');
+        }
+        return base64_encode($encrypted);
+    }
+
+    /**
+     * 获取签名文件内容
+     * @return string
+     * @throws Exceptions\LocalCacheException
+     * @throws Exceptions\InvalidResponseException
+     */
+    private function getRsaContent()
+    {
+        $cacheKey = "pub_ras_key_" . $this->config->get('mch_id');
+        if (($pub_key = Tools::getCache($cacheKey))) {
+            return $pub_key;
+        }
+        $data = $this->callPostApi('https://fraud.mch.weixin.qq.com/risk/getpublickey', [], true, 'MD5');
+        if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS' || $data['result_code'] !== 'SUCCESS') {
+            $error = 'ResultError:' . $data['return_msg'];
+            $error .= isset($data['err_code_des']) ? ' - ' . $data['err_code_des'] : '';
+            throw new InvalidResponseException($error, 20000, $data);
+        }
+        Tools::setCache($cacheKey, $data['pub_key'], 600);
+        return $data['pub_key'];
+    }
+
     /**
      * 获取微信支付通知
      * @return array
@@ -305,11 +398,10 @@ class Pay
         if ($isCert) {
             $option['ssl_cer'] = $this->config->get('ssl_cer');
             $option['ssl_key'] = $this->config->get('ssl_key');
-            foreach (['ssl_cer', 'ssl_key'] as $key) {
-                if (empty($option[$key]) || !file_exists($option[$key])) {
-                    throw new InvalidArgumentException("Missing Config -- [{$key}]", '0');
-                }
-            }
+            if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer']))
+                throw new InvalidArgumentException("Missing Config -- ssl_cer", '0');
+            if (empty($option['ssl_key']) || !file_exists($option['ssl_key']))
+                throw new InvalidArgumentException("Missing Config -- ssl_key", '0');
         }
         $params = $this->params->merge($data);
         $needSignType && ($params['sign_type'] = strtoupper($signType));

From 0bf349659df9b279392fca165c6cbd9ef7ca3996 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 19:16:05 +0800
Subject: [PATCH 031/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 5af3416..3e3fe02 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -249,6 +249,7 @@ class Pay
      */
     public function queryTransfers($partner_trade_no)
     {
+        $this->params->offsetUnset('appid');
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
         return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
     }
@@ -297,6 +298,7 @@ class Pay
      */
     public function queryTransFresBank($partner_trade_no)
     {
+        $this->params->offsetUnset('appid');
         $url = 'https://api.mch.weixin.qq.com/mmpaysptrans/query_bank';
         return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
     }

From 1278e575b3ce7c60d056f5bb33f719514b60a90d Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 19:17:21 +0800
Subject: [PATCH 032/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 3e3fe02..9fd78d7 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -249,7 +249,6 @@ class Pay
      */
     public function queryTransfers($partner_trade_no)
     {
-        $this->params->offsetUnset('appid');
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
         return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
     }

From 88537106358acd1616ec3eb1455130798eef8305 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 11 May 2018 19:20:46 +0800
Subject: [PATCH 033/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/pay-transfers-create.php | 2 ++
 WeChat/Pay.php                | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/Test/pay-transfers-create.php b/Test/pay-transfers-create.php
index 7e4735c..77d70b0 100644
--- a/Test/pay-transfers-create.php
+++ b/Test/pay-transfers-create.php
@@ -35,6 +35,8 @@ try {
     $result = $wechat->createTransfers($options);
     echo '<pre>';
     var_export($result);
+    $result = $wechat->queryTransfers($options['partner_trade_no']);
+    var_export($result);
 
 } catch (Exception $e) {
 
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 9fd78d7..84d7d40 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -250,6 +250,10 @@ class Pay
     public function queryTransfers($partner_trade_no)
     {
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
+        $this->params->set('appid', $this->config->get('appid'));
+        $this->params->set('mch_id', $this->config->get('mch_id'));
+        $this->params->offsetUnset('mchid');
+        $this->params->offsetUnset('mch_appid');
         return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
     }
 

From a3b3b4b1c1b8ecd5d1492615070d698d7b735fb3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 15 May 2018 09:50:25 +0800
Subject: [PATCH 034/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E7=BB=84=E8=BD=ACJSON=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 4cfe9b8..a9bf0a9 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -155,7 +155,7 @@ class Tools
     {
         return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', function ($matches) {
             return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");
-        }, json_encode($data));
+        }, ($jsonData = json_encode($data)) == '[]' ? '{}' : $jsonData);
     }
 
     /**

From f01ac5dafc85cb408fd3e0bafc462437785ae178 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 16 May 2018 13:48:16 +0800
Subject: [PATCH 035/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=B4=A6=E5=8D=95=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 84d7d40..3f40508 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -202,14 +202,23 @@ class Pay
 
     /**
      * 下载对账单
-     * @param array $options
-     * @return array
+     * @param array $options 静音参数
+     * @param null|string $outType 输出类型
+     * @return bool|string
      * @throws InvalidResponseException
      */
-    public function billDownload(array $options)
+    public function billDownload(array $options, $outType = null)
     {
-        $url = 'https://api.mch.weixin.qq.com/pay/downloadbill';
-        return $this->callPostApi($url, $options);
+        $this->params->set('sign_type', 'MD5');
+        $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 ($jsonData['return_code'] !== 'SUCCESS') {
+                throw new InvalidResponseException($jsonData['return_msg'], '0');
+            }
+        }
+        return is_null($outType) ? $result : $outType($result);
     }
 
 

From 3d1fa6740251034c16e0243ce84b035902bd437b Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 24 May 2018 11:47:40 +0800
Subject: [PATCH 036/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=88=86=E7=A6=BB?=
 =?UTF-8?q?=E5=87=BAWePay=E4=B8=BA=E5=90=8E=E7=BB=A7=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicPay.php | 145 ++++++++++++++++++
 WeChat/Pay.php                | 275 +++++-----------------------------
 WePay/Bill.php                |  61 ++++++++
 WePay/Order.php               | 123 +++++++++++++++
 WePay/Refund.php              |  51 +++++++
 WePay/TransFresBank.php       | 124 +++++++++++++++
 WePay/Transfers.php           |  59 ++++++++
 composer.json                 |   3 +
 include.php                   |   4 +-
 9 files changed, 606 insertions(+), 239 deletions(-)
 create mode 100644 WeChat/Contracts/BasicPay.php
 create mode 100644 WePay/Bill.php
 create mode 100644 WePay/Order.php
 create mode 100644 WePay/Refund.php
 create mode 100644 WePay/TransFresBank.php
 create mode 100644 WePay/Transfers.php

diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicPay.php
new file mode 100644
index 0000000..c96f2d9
--- /dev/null
+++ b/WeChat/Contracts/BasicPay.php
@@ -0,0 +1,145 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeChat\Contracts;
+
+use WeChat\Exceptions\InvalidArgumentException;
+use WeChat\Exceptions\InvalidResponseException;
+
+/**
+ * 微信支付基础类
+ * Class BasicPay
+ * @package WeChat\Contracts
+ */
+class BasicPay
+{
+    /**
+     * 商户配置
+     * @var DataArray
+     */
+    protected $config;
+
+    /**
+     * 当前请求数据
+     * @var DataArray
+     */
+    protected $params;
+
+
+    /**
+     * WeChat constructor.
+     * @param array $options
+     */
+    public function __construct(array $options)
+    {
+        if (empty($options['appid'])) {
+            throw new InvalidArgumentException("Missing Config -- [appid]");
+        }
+        if (empty($options['mch_id'])) {
+            throw new InvalidArgumentException("Missing Config -- [mch_id]");
+        }
+        if (empty($options['mch_key'])) {
+            throw new InvalidArgumentException("Missing Config -- [mch_key]");
+        }
+        if (!empty($options['cache_path'])) {
+            Tools::$cache_path = $options['cache_path'];
+        }
+        $this->config = new DataArray($options);
+        $this->params = new DataArray([
+            'appid'     => $this->config->get('appid'),
+            'mch_id'    => $this->config->get('mch_id'),
+            'nonce_str' => Tools::createNoncestr(),
+        ]);
+    }
+
+    /**
+     * 获取微信支付通知
+     * @return array
+     * @throws InvalidResponseException
+     */
+    public function getNotify()
+    {
+        $data = Tools::xml2arr(file_get_contents('php://input'));
+        if (!empty($data['sign'])) {
+            if ($this->getPaySign($data) === $data['sign']) {
+                return $data;
+            }
+        }
+        throw new InvalidResponseException('Invalid Notify.', '0');
+    }
+
+    /**
+     * 生成支付签名
+     * @param array $data 参与签名的数据
+     * @param string $signType 参与签名的类型
+     * @param string $buff 参与签名字符串前缀
+     * @return string
+     */
+    public function getPaySign(array $data, $signType = 'MD5', $buff = '')
+    {
+        unset($data['sign']);
+        ksort($data);
+        foreach ($data as $k => $v) {
+            $buff .= "{$k}={$v}&";
+        }
+        $buff .= ("key=" . $this->config->get('mch_key'));
+        if (strtoupper($signType) === 'MD5') {
+            return strtoupper(md5($buff));
+        }
+        return strtoupper(hash_hmac('SHA256', $buff, $this->config->get('mch_key')));
+    }
+
+    /**
+     * 转换短链接
+     * @param string $longUrl 需要转换的URL，签名用原串，传输需URLencode
+     * @return array
+     * @throws InvalidResponseException
+     */
+    public function shortUrl($longUrl)
+    {
+        $url = 'https://api.mch.weixin.qq.com/tools/shorturl';
+        return $this->callPostApi($url, ['long_url' => $longUrl]);
+    }
+
+    /**
+     * 以Post请求接口
+     * @param string $url 请求
+     * @param array $data 接口参数
+     * @param bool $isCert 是否需要使用双向证书
+     * @param string $signType 数据签名类型 MD5|SHA256
+     * @param bool $needSignType 是否需要传签名类型参数
+     * @return array
+     * @throws InvalidResponseException
+     */
+    protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true)
+    {
+        $option = [];
+        if ($isCert) {
+            $option['ssl_cer'] = $this->config->get('ssl_cer');
+            $option['ssl_key'] = $this->config->get('ssl_key');
+            if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer']))
+                throw new InvalidArgumentException("Missing Config -- ssl_cer", '0');
+            if (empty($option['ssl_key']) || !file_exists($option['ssl_key']))
+                throw new InvalidArgumentException("Missing Config -- ssl_key", '0');
+        }
+        $params = $this->params->merge($data);
+        $needSignType && ($params['sign_type'] = strtoupper($signType));
+        $params['sign'] = $this->getPaySign($params, $signType);
+        $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
+        if ($result['return_code'] !== 'SUCCESS') {
+            throw new InvalidResponseException($result['return_msg'], '0');
+        }
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 3f40508..ff89411 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -14,18 +14,21 @@
 
 namespace WeChat;
 
+use WeChat\Contracts\BasicPay;
 use WeChat\Contracts\DataArray;
-use WeChat\Contracts\Tools;
-use WeChat\Exceptions\InvalidArgumentException;
-use WeChat\Exceptions\InvalidDecryptException;
 use WeChat\Exceptions\InvalidResponseException;
+use WePay\Bill;
+use WePay\Order;
+use WePay\Refund;
+use WePay\Transfers;
+use WePay\TransFresBank;
 
 /**
  * 微信支付商户
  * Class Pay
  * @package WeChat\Contracts
  */
-class Pay
+class Pay extends BasicPay
 {
 
     /**
@@ -40,33 +43,6 @@ class Pay
      */
     protected $params;
 
-
-    /**
-     * WeChat constructor.
-     * @param array $options
-     */
-    public function __construct(array $options)
-    {
-        if (empty($options['appid'])) {
-            throw new InvalidArgumentException("Missing Config -- [appid]");
-        }
-        if (empty($options['mch_id'])) {
-            throw new InvalidArgumentException("Missing Config -- [mch_id]");
-        }
-        if (empty($options['mch_key'])) {
-            throw new InvalidArgumentException("Missing Config -- [mch_key]");
-        }
-        if (!empty($options['cache_path'])) {
-            Tools::$cache_path = $options['cache_path'];
-        }
-        $this->config = new DataArray($options);
-        $this->params = new DataArray([
-            'appid'     => $this->config->get('appid'),
-            'mch_id'    => $this->config->get('mch_id'),
-            'nonce_str' => Tools::createNoncestr(),
-        ]);
-    }
-
     /**
      * 统一下单
      * @param array $options
@@ -75,8 +51,8 @@ class Pay
      */
     public function createOrder(array $options)
     {
-        $url = 'https://api.mch.weixin.qq.com/pay/unifiedorder';
-        return $this->callPostApi($url, $options, false, 'MD5');
+        $pay = new Order($this->config->get());
+        return $pay->create($options);
     }
 
 
@@ -87,15 +63,8 @@ class Pay
      */
     public function createParamsForJsApi($prepay_id)
     {
-        $option = [];
-        $option["appId"] = $this->config->get('appid');
-        $option["timeStamp"] = (string)time();
-        $option["nonceStr"] = Tools::createNoncestr();
-        $option["package"] = "prepay_id={$prepay_id}";
-        $option["signType"] = "MD5";
-        $option["paySign"] = $this->getPaySign($option, 'MD5');
-        $option['timestamp'] = $option['timeStamp'];
-        return $option;
+        $pay = new Order($this->config->get());
+        return $pay->jsapiParams($prepay_id);
     }
 
     /**
@@ -105,15 +74,8 @@ class Pay
      */
     public function createParamsForRuleQrc($product_id)
     {
-        $data = [
-            'appid'      => $this->config->get('appid'),
-            'mch_id'     => $this->config->get('mch_id'),
-            'time_stamp' => (string)time(),
-            'nonce_str'  => Tools::createNoncestr(),
-            'product_id' => (string)$product_id,
-        ];
-        $data['sign'] = $this->getPaySign($data, 'MD5');
-        return "weixin://wxpay/bizpayurl?" . http_build_query($data);
+        $pay = new Order($this->config->get());
+        return $pay->qrcParams($product_id);
     }
 
     /**
@@ -124,8 +86,8 @@ class Pay
      */
     public function queryOrder(array $options)
     {
-        $url = 'https://api.mch.weixin.qq.com/pay/orderquery';
-        return $this->callPostApi($url, $options);
+        $pay = new Order($this->config->get());
+        return $pay->query($options);
     }
 
     /**
@@ -136,8 +98,8 @@ class Pay
      */
     public function closeOrder($out_trade_no)
     {
-        $url = 'https://api.mch.weixin.qq.com/pay/closeorder';
-        return $this->callPostApi($url, ['out_trade_no' => $out_trade_no]);
+        $pay = new Order($this->config->get());
+        return $pay->close($out_trade_no);
     }
 
     /**
@@ -148,8 +110,8 @@ class Pay
      */
     public function createRefund(array $options)
     {
-        $url = 'https://api.mch.weixin.qq.com/secapi/pay/refund';
-        return $this->callPostApi($url, $options, true);
+        $pay = new Refund($this->config->get());
+        return $pay->create($options);
     }
 
     /**
@@ -160,8 +122,8 @@ class Pay
      */
     public function queryRefund(array $options)
     {
-        $url = 'https://api.mch.weixin.qq.com/pay/refundquery';
-        return $this->callPostApi($url, $options);
+        $pay = new Refund($this->config->get());
+        return $pay->query($options);
     }
 
     /**
@@ -172,8 +134,8 @@ class Pay
      */
     public function report(array $options)
     {
-        $url = 'https://api.mch.weixin.qq.com/payitil/report';
-        return $this->callPostApi($url, $options);
+        $pay = new Order($this->config->get());
+        return $pay->report($options);
     }
 
     /**
@@ -184,20 +146,8 @@ class Pay
      */
     public function queryAuthCode($authCode)
     {
-        $url = 'https://api.mch.weixin.qq.com/tools/authcodetoopenid';
-        return $this->callPostApi($url, ['auth_code' => $authCode]);
-    }
-
-    /**
-     * 转换短链接
-     * @param string $longUrl 需要转换的URL，签名用原串，传输需URLencode
-     * @return array
-     * @throws InvalidResponseException
-     */
-    public function shortUrl($longUrl)
-    {
-        $url = 'https://api.mch.weixin.qq.com/tools/shorturl';
-        return $this->callPostApi($url, ['long_url' => $longUrl]);
+        $pay = new Order($this->config->get());
+        return $pay->queryAuthCode($authCode);
     }
 
     /**
@@ -209,16 +159,8 @@ class Pay
      */
     public function billDownload(array $options, $outType = null)
     {
-        $this->params->set('sign_type', 'MD5');
-        $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 ($jsonData['return_code'] !== 'SUCCESS') {
-                throw new InvalidResponseException($jsonData['return_msg'], '0');
-            }
-        }
-        return is_null($outType) ? $result : $outType($result);
+        $pay = new Bill($this->config->get());
+        return $pay->download($options, $outType);
     }
 
 
@@ -230,8 +172,8 @@ class Pay
      */
     public function billCommtent(array $options)
     {
-        $url = 'https://api.mch.weixin.qq.com/billcommentsp/batchquerycomment';
-        return $this->callPostApi($url, $options, true);
+        $pay = new Bill($this->config->get());
+        return $pay->commtent($options);
     }
 
     /**
@@ -242,12 +184,8 @@ class Pay
      */
     public function createTransfers(array $options)
     {
-        $this->params->set('mchid', $this->config->get('mch_id'));
-        $this->params->set('mch_appid', $this->config->get('appid'));
-        $this->params->offsetUnset('appid');
-        $this->params->offsetUnset('mch_id');
-        $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers';
-        return $this->callPostApi($url, $options, true, 'MD5', false);
+        $pay = new Transfers($this->config->get());
+        return $pay->create($options);
     }
 
     /**
@@ -258,12 +196,8 @@ class Pay
      */
     public function queryTransfers($partner_trade_no)
     {
-        $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
-        $this->params->set('appid', $this->config->get('appid'));
-        $this->params->set('mch_id', $this->config->get('mch_id'));
-        $this->params->offsetUnset('mchid');
-        $this->params->offsetUnset('mch_appid');
-        return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
+        $pay = new Transfers($this->config->get());
+        return $pay->query($partner_trade_no);
     }
 
     /**
@@ -276,30 +210,8 @@ class Pay
      */
     public function createTransfersBank(array $options)
     {
-        if (!isset($options['partner_trade_no'])) {
-            throw new InvalidArgumentException('Missing Options -- [partner_trade_no]');
-        }
-        if (!isset($options['enc_bank_no'])) {
-            throw new InvalidArgumentException('Missing Options -- [enc_bank_no]');
-        }
-        if (!isset($options['enc_true_name'])) {
-            throw new InvalidArgumentException('Missing Options -- [enc_true_name]');
-        }
-        if (!isset($options['bank_code'])) {
-            throw new InvalidArgumentException('Missing Options -- [bank_code]');
-        }
-        if (!isset($options['amount'])) {
-            throw new InvalidArgumentException('Missing Options -- [amount]');
-        }
-        isset($options['desc']) && $this->config['desc'] = $options['desc'];
-        $this->params->offsetUnset('appid');
-        return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
-            'amount'           => $options['amount'],
-            'bank_code'        => $options['bank_code'],
-            'partner_trade_no' => $options['partner_trade_no'],
-            'enc_bank_no'      => $this->rsaEncode($options['enc_bank_no']),
-            'enc_true_name'    => $this->rsaEncode($options['enc_true_name']),
-        ], true, 'MD5', false);
+        $pay = new TransFresBank($this->config->get());
+        return $pay->create($options);
     }
 
     /**
@@ -310,120 +222,7 @@ class Pay
      */
     public function queryTransFresBank($partner_trade_no)
     {
-        $this->params->offsetUnset('appid');
-        $url = 'https://api.mch.weixin.qq.com/mmpaysptrans/query_bank';
-        return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
-    }
-
-    /**
-     * RSA加密处理
-     * @param string $string
-     * @param string $encrypted
-     * @return string
-     * @throws Exceptions\LocalCacheException
-     * @throws Exceptions\InvalidDecryptException
-     * @throws Exceptions\InvalidResponseException
-     */
-    private function rsaEncode($string, $encrypted = '')
-    {
-        $search = ['-----BEGIN RSA PUBLIC KEY-----', '-----END RSA PUBLIC KEY-----', "\n", "\r"];
-        $pkc1 = str_replace($search, '', $this->getRsaContent());
-        $publicKey = '-----BEGIN PUBLIC KEY-----' . PHP_EOL .
-            wordwrap('MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A' . $pkc1, 64, PHP_EOL, true) . PHP_EOL .
-            '-----END PUBLIC KEY-----';
-        if (!openssl_public_encrypt("{$string}", $encrypted, $publicKey, OPENSSL_PKCS1_OAEP_PADDING)) {
-            throw new InvalidDecryptException('Rsa Encrypt Error.');
-        }
-        return base64_encode($encrypted);
-    }
-
-    /**
-     * 获取签名文件内容
-     * @return string
-     * @throws Exceptions\LocalCacheException
-     * @throws Exceptions\InvalidResponseException
-     */
-    private function getRsaContent()
-    {
-        $cacheKey = "pub_ras_key_" . $this->config->get('mch_id');
-        if (($pub_key = Tools::getCache($cacheKey))) {
-            return $pub_key;
-        }
-        $data = $this->callPostApi('https://fraud.mch.weixin.qq.com/risk/getpublickey', [], true, 'MD5');
-        if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS' || $data['result_code'] !== 'SUCCESS') {
-            $error = 'ResultError:' . $data['return_msg'];
-            $error .= isset($data['err_code_des']) ? ' - ' . $data['err_code_des'] : '';
-            throw new InvalidResponseException($error, 20000, $data);
-        }
-        Tools::setCache($cacheKey, $data['pub_key'], 600);
-        return $data['pub_key'];
-    }
-
-    /**
-     * 获取微信支付通知
-     * @return array
-     * @throws InvalidResponseException
-     */
-    public function getNotify()
-    {
-        $data = Tools::xml2arr(file_get_contents('php://input'));
-        if (!empty($data['sign'])) {
-            if ($this->getPaySign($data) === $data['sign']) {
-                return $data;
-            }
-        }
-        throw new InvalidResponseException('Invalid Notify.', '0');
-    }
-
-    /**
-     * 生成支付签名
-     * @param array $data 参与签名的数据
-     * @param string $signType 参与签名的类型
-     * @param string $buff 参与签名字符串前缀
-     * @return string
-     */
-    public function getPaySign(array $data, $signType = 'MD5', $buff = '')
-    {
-        unset($data['sign']);
-        ksort($data);
-        foreach ($data as $k => $v) {
-            $buff .= "{$k}={$v}&";
-        }
-        $buff .= ("key=" . $this->config->get('mch_key'));
-        if (strtoupper($signType) === 'MD5') {
-            return strtoupper(md5($buff));
-        }
-        return strtoupper(hash_hmac('SHA256', $buff, $this->config->get('mch_key')));
-    }
-
-    /**
-     * 以Post请求接口
-     * @param string $url 请求
-     * @param array $data 接口参数
-     * @param bool $isCert 是否需要使用双向证书
-     * @param string $signType 数据签名类型 MD5|SHA256
-     * @param bool $needSignType 是否需要传签名类型参数
-     * @return array
-     * @throws InvalidResponseException
-     */
-    public function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true)
-    {
-        $option = [];
-        if ($isCert) {
-            $option['ssl_cer'] = $this->config->get('ssl_cer');
-            $option['ssl_key'] = $this->config->get('ssl_key');
-            if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer']))
-                throw new InvalidArgumentException("Missing Config -- ssl_cer", '0');
-            if (empty($option['ssl_key']) || !file_exists($option['ssl_key']))
-                throw new InvalidArgumentException("Missing Config -- ssl_key", '0');
-        }
-        $params = $this->params->merge($data);
-        $needSignType && ($params['sign_type'] = strtoupper($signType));
-        $params['sign'] = $this->getPaySign($params, $signType);
-        $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
-        if ($result['return_code'] !== 'SUCCESS') {
-            throw new InvalidResponseException($result['return_msg'], '0');
-        }
-        return $result;
+        $pay = new TransFresBank($this->config->get());
+        return $pay->query($partner_trade_no);
     }
 }
\ No newline at end of file
diff --git a/WePay/Bill.php b/WePay/Bill.php
new file mode 100644
index 0000000..f8a5106
--- /dev/null
+++ b/WePay/Bill.php
@@ -0,0 +1,61 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WePay;
+
+use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\Tools;
+use WeChat\Exceptions\InvalidResponseException;
+
+/**
+ * 微信商户账单及评论
+ * Class Bill
+ * @package WePay
+ */
+class Bill extends BasicPay
+{
+    /**
+     * 下载对账单
+     * @param array $options 静音参数
+     * @param null|string $outType 输出类型
+     * @return bool|string
+     * @throws InvalidResponseException
+     */
+    public function download(array $options, $outType = null)
+    {
+        $this->params->set('sign_type', 'MD5');
+        $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 ($jsonData['return_code'] !== 'SUCCESS') {
+                throw new InvalidResponseException($jsonData['return_msg'], '0');
+            }
+        }
+        return is_null($outType) ? $result : $outType($result);
+    }
+
+
+    /**
+     * 拉取订单评价数据
+     * @param array $options
+     * @return array
+     * @throws InvalidResponseException
+     */
+    public function commtent(array $options)
+    {
+        $url = 'https://api.mch.weixin.qq.com/billcommentsp/batchquerycomment';
+        return $this->callPostApi($url, $options, true);
+    }
+}
\ No newline at end of file
diff --git a/WePay/Order.php b/WePay/Order.php
new file mode 100644
index 0000000..e9eca12
--- /dev/null
+++ b/WePay/Order.php
@@ -0,0 +1,123 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WePay;
+
+use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\Tools;
+
+/**
+ * 微信商户订单
+ * Class Order
+ * @package WePay
+ */
+class Order extends BasicPay
+{
+
+    /**
+     * 统一下单
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function create(array $options)
+    {
+        $url = 'https://api.mch.weixin.qq.com/pay/unifiedorder';
+        return $this->callPostApi($url, $options, false, 'MD5');
+    }
+
+    /**
+     * 查询订单
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function query(array $options)
+    {
+        $url = 'https://api.mch.weixin.qq.com/pay/orderquery';
+        return $this->callPostApi($url, $options);
+    }
+
+    /**
+     * 关闭订单
+     * @param string $outTradeNo 商户订单号
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function close($outTradeNo)
+    {
+        $url = 'https://api.mch.weixin.qq.com/pay/closeorder';
+        return $this->callPostApi($url, ['out_trade_no' => $outTradeNo]);
+    }
+
+    /**
+     * 创建JsApi及H5支付参数
+     * @param string $prepayId 统一下单预支付码
+     * @return array
+     */
+    public function jsapiParams($prepayId)
+    {
+        $option = [];
+        $option["appId"] = $this->config->get('appid');
+        $option["timeStamp"] = (string)time();
+        $option["nonceStr"] = Tools::createNoncestr();
+        $option["package"] = "prepay_id={$prepayId}";
+        $option["signType"] = "MD5";
+        $option["paySign"] = $this->getPaySign($option, 'MD5');
+        $option['timestamp'] = $option['timeStamp'];
+        return $option;
+    }
+
+    /**
+     * 授权码查询openid
+     * @param string $authCode 扫码支付授权码，设备读取用户微信中的条码或者二维码信息
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function queryAuthCode($authCode)
+    {
+        $url = 'https://api.mch.weixin.qq.com/tools/authcodetoopenid';
+        return $this->callPostApi($url, ['auth_code' => $authCode]);
+    }
+
+    /**
+     * 获取支付规则二维码
+     * @param string $productId 商户定义的商品id或者订单号
+     * @return string
+     */
+    public function qrcParams($productId)
+    {
+        $data = [
+            'appid'      => $this->config->get('appid'),
+            'mch_id'     => $this->config->get('mch_id'),
+            'time_stamp' => (string)time(),
+            'nonce_str'  => Tools::createNoncestr(),
+            'product_id' => (string)$productId,
+        ];
+        $data['sign'] = $this->getPaySign($data, 'MD5');
+        return "weixin://wxpay/bizpayurl?" . http_build_query($data);
+    }
+
+    /**
+     * 交易保障
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function report(array $options)
+    {
+        $url = 'https://api.mch.weixin.qq.com/payitil/report';
+        return $this->callPostApi($url, $options);
+    }
+}
\ No newline at end of file
diff --git a/WePay/Refund.php b/WePay/Refund.php
new file mode 100644
index 0000000..a91493e
--- /dev/null
+++ b/WePay/Refund.php
@@ -0,0 +1,51 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WePay;
+
+use WeChat\Contracts\BasicPay;
+
+/**
+ * 微信商户退款
+ * Class Refund
+ * @package WePay
+ */
+class Refund extends BasicPay
+{
+
+    /**
+     * 创建退款订单
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function create(array $options)
+    {
+        $url = 'https://api.mch.weixin.qq.com/secapi/pay/refund';
+        return $this->callPostApi($url, $options, true);
+    }
+
+    /**
+     * 查询退款
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function query(array $options)
+    {
+        $url = 'https://api.mch.weixin.qq.com/pay/refundquery';
+        return $this->callPostApi($url, $options);
+    }
+
+}
\ No newline at end of file
diff --git a/WePay/TransFresBank.php b/WePay/TransFresBank.php
new file mode 100644
index 0000000..8c10936
--- /dev/null
+++ b/WePay/TransFresBank.php
@@ -0,0 +1,124 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WePay;
+
+use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\Tools;
+use WeChat\Exceptions\InvalidArgumentException;
+use WeChat\Exceptions\InvalidDecryptException;
+use WeChat\Exceptions\InvalidResponseException;
+
+/**
+ * 微信商户打款到银行卡
+ * Class TransFresBank
+ * @package WePay
+ */
+class TransFresBank extends BasicPay
+{
+
+    /**
+     * 企业付款到银行卡
+     * @param array $options
+     * @return array
+     * @throws InvalidDecryptException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function create(array $options)
+    {
+        if (!isset($options['partner_trade_no'])) {
+            throw new InvalidArgumentException('Missing Options -- [partner_trade_no]');
+        }
+        if (!isset($options['enc_bank_no'])) {
+            throw new InvalidArgumentException('Missing Options -- [enc_bank_no]');
+        }
+        if (!isset($options['enc_true_name'])) {
+            throw new InvalidArgumentException('Missing Options -- [enc_true_name]');
+        }
+        if (!isset($options['bank_code'])) {
+            throw new InvalidArgumentException('Missing Options -- [bank_code]');
+        }
+        if (!isset($options['amount'])) {
+            throw new InvalidArgumentException('Missing Options -- [amount]');
+        }
+        isset($options['desc']) && $this->config['desc'] = $options['desc'];
+        $this->params->offsetUnset('appid');
+        return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
+            'amount'           => $options['amount'],
+            'bank_code'        => $options['bank_code'],
+            'partner_trade_no' => $options['partner_trade_no'],
+            'enc_bank_no'      => $this->rsaEncode($options['enc_bank_no']),
+            'enc_true_name'    => $this->rsaEncode($options['enc_true_name']),
+        ], true, 'MD5', false);
+    }
+
+    /**
+     * 商户企业付款到银行卡操作进行结果查询
+     * @param string $partnerTradeNo 商户订单号，需保持唯一
+     * @return array
+     * @throws InvalidResponseException
+     */
+    public function query($partnerTradeNo)
+    {
+        $this->params->offsetUnset('appid');
+        $url = 'https://api.mch.weixin.qq.com/mmpaysptrans/query_bank';
+        return $this->callPostApi($url, ['partner_trade_no' => $partnerTradeNo], true, 'MD5', false);
+    }
+
+    /**
+     * RSA加密处理
+     * @param string $string
+     * @param string $encrypted
+     * @return string
+     * @throws InvalidDecryptException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    private function rsaEncode($string, $encrypted = '')
+    {
+        $search = ['-----BEGIN RSA PUBLIC KEY-----', '-----END RSA PUBLIC KEY-----', "\n", "\r"];
+        $pkc1 = str_replace($search, '', $this->getRsaContent());
+        $publicKey = '-----BEGIN PUBLIC KEY-----' . PHP_EOL .
+            wordwrap('MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A' . $pkc1, 64, PHP_EOL, true) . PHP_EOL .
+            '-----END PUBLIC KEY-----';
+        if (!openssl_public_encrypt("{$string}", $encrypted, $publicKey, OPENSSL_PKCS1_OAEP_PADDING)) {
+            throw new InvalidDecryptException('Rsa Encrypt Error.');
+        }
+        return base64_encode($encrypted);
+    }
+
+    /**
+     * 获取签名文件内容
+     * @return string
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    private function getRsaContent()
+    {
+        $cacheKey = "pub_ras_key_" . $this->config->get('mch_id');
+        if (($pub_key = Tools::getCache($cacheKey))) {
+            return $pub_key;
+        }
+        $data = $this->callPostApi('https://fraud.mch.weixin.qq.com/risk/getpublickey', [], true, 'MD5');
+        if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS' || $data['result_code'] !== 'SUCCESS') {
+            $error = 'ResultError:' . $data['return_msg'];
+            $error .= isset($data['err_code_des']) ? ' - ' . $data['err_code_des'] : '';
+            throw new InvalidResponseException($error, 20000, $data);
+        }
+        Tools::setCache($cacheKey, $data['pub_key'], 600);
+        return $data['pub_key'];
+    }
+
+}
\ No newline at end of file
diff --git a/WePay/Transfers.php b/WePay/Transfers.php
new file mode 100644
index 0000000..410aa8b
--- /dev/null
+++ b/WePay/Transfers.php
@@ -0,0 +1,59 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WePay;
+
+use WeChat\Contracts\BasicPay;
+
+/**
+ * 微信商户打款到零钱
+ * Class Transfers
+ * @package WePay
+ */
+class Transfers extends BasicPay
+{
+
+    /**
+     * 企业付款到零钱
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function create(array $options)
+    {
+        $this->params->set('mchid', $this->config->get('mch_id'));
+        $this->params->set('mch_appid', $this->config->get('appid'));
+        $this->params->offsetUnset('appid');
+        $this->params->offsetUnset('mch_id');
+        $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers';
+        return $this->callPostApi($url, $options, true, 'MD5', false);
+    }
+
+    /**
+     * 查询企业付款到零钱
+     * @param string $partnerTradeNo 商户调用企业付款API时使用的商户订单号
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function query($partnerTradeNo)
+    {
+        $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
+        $this->params->set('appid', $this->config->get('appid'));
+        $this->params->set('mch_id', $this->config->get('mch_id'));
+        $this->params->offsetUnset('mchid');
+        $this->params->offsetUnset('mch_appid');
+        return $this->callPostApi($url, ['partner_trade_no' => $partnerTradeNo], true, 'MD5', false);
+    }
+
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 895e4e8..0351696 100644
--- a/composer.json
+++ b/composer.json
@@ -12,6 +12,8 @@
     }
   ],
   "keywords": [
+    "WePay",
+    "WeMini",
     "WeChat",
     "WeChatPay",
     "WeChatDeveloper"
@@ -23,6 +25,7 @@
   },
   "autoload": {
     "psr-4": {
+      "WePay\\": "WePay",
       "WeChat\\": "WeChat",
       "WeMini\\": "WeMini"
     }
diff --git a/include.php b/include.php
index 889d8c6..dfd4e9e 100644
--- a/include.php
+++ b/include.php
@@ -12,7 +12,6 @@
 // | github开源项目：https://github.com/zoujingli/WeChatDeveloper
 // +----------------------------------------------------------------------
 
-// 动态注册SDK自动加载
 spl_autoload_register(function ($classname) {
     $separator = DIRECTORY_SEPARATOR;
     $filename = __DIR__ . $separator . str_replace('\\', $separator, $classname) . '.php';
@@ -23,5 +22,8 @@ spl_autoload_register(function ($classname) {
         if (stripos($classname, 'WeMini') === 0) {
             include $filename;
         }
+        if (stripos($classname, 'WePay') === 0) {
+            include $filename;
+        }
     }
 });
\ No newline at end of file

From c3206134c3475a4c6e3b535a5ba8dcc33a4fca04 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 24 May 2018 11:49:04 +0800
Subject: [PATCH 037/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=B1=BB=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/Bill.php          |  4 ++--
 WePay/TransFresBank.php | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WePay/Bill.php b/WePay/Bill.php
index f8a5106..d24b929 100644
--- a/WePay/Bill.php
+++ b/WePay/Bill.php
@@ -30,7 +30,7 @@ class Bill extends BasicPay
      * @param array $options 静音参数
      * @param null|string $outType 输出类型
      * @return bool|string
-     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\InvalidResponseException
      */
     public function download(array $options, $outType = null)
     {
@@ -51,7 +51,7 @@ class Bill extends BasicPay
      * 拉取订单评价数据
      * @param array $options
      * @return array
-     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\InvalidResponseException
      */
     public function commtent(array $options)
     {
diff --git a/WePay/TransFresBank.php b/WePay/TransFresBank.php
index 8c10936..b4400d2 100644
--- a/WePay/TransFresBank.php
+++ b/WePay/TransFresBank.php
@@ -32,8 +32,8 @@ class TransFresBank extends BasicPay
      * 企业付款到银行卡
      * @param array $options
      * @return array
-     * @throws InvalidDecryptException
-     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\InvalidDecryptException
+     * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function create(array $options)
@@ -68,7 +68,7 @@ class TransFresBank extends BasicPay
      * 商户企业付款到银行卡操作进行结果查询
      * @param string $partnerTradeNo 商户订单号，需保持唯一
      * @return array
-     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\InvalidResponseException
      */
     public function query($partnerTradeNo)
     {
@@ -82,8 +82,8 @@ class TransFresBank extends BasicPay
      * @param string $string
      * @param string $encrypted
      * @return string
-     * @throws InvalidDecryptException
-     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\InvalidDecryptException
+     * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
     private function rsaEncode($string, $encrypted = '')
@@ -102,7 +102,7 @@ class TransFresBank extends BasicPay
     /**
      * 获取签名文件内容
      * @return string
-     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
     private function getRsaContent()

From 24236876989d54e11e91549fa8fdb5ef79bd6ec7 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 24 May 2018 13:48:35 +0800
Subject: [PATCH 038/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0W?=
 =?UTF-8?q?e=E5=BF=AB=E9=80=9F=E5=8A=A0=E8=BD=BD=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +-
 Test/mini-qrc.php                             |   6 +-
 We.php                                        | 107 ++++++++++++++++++
 .../Exceptions/InvalidInstanceException.php   |  40 +++++++
 WeChat/Oauth.php                              |   4 +
 WeChat/Pay.php                                |  13 ---
 composer.json                                 |   3 +
 include.php                                   |   3 +
 8 files changed, 164 insertions(+), 15 deletions(-)
 create mode 100644 We.php
 create mode 100644 WeChat/Exceptions/InvalidInstanceException.php

diff --git a/.gitignore b/.gitignore
index 1d2b80a..d13044c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-/.idea
 /.git
+/.idea
 /.DS_Store
 /vendor
 /Cache
 /Test/cert
+/composer.lock
diff --git a/Test/mini-qrc.php b/Test/mini-qrc.php
index f636610..ce62ae1 100644
--- a/Test/mini-qrc.php
+++ b/Test/mini-qrc.php
@@ -8,7 +8,11 @@ $config = [
     'appsecret' => '78b7b8d65bd67b078babf951d4342b42',
 ];
 
-$mini = new WeMini\Qrcode($config);
+//We::config($config);
+
+$mini = We::WeMiniQrcode($config);
+
+//$mini = new WeMini\Qrcode($config);
 
 //echo '<pre>';
 try {
diff --git a/We.php b/We.php
new file mode 100644
index 0000000..0f0dbc4
--- /dev/null
+++ b/We.php
@@ -0,0 +1,107 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+use WeChat\Contracts\DataArray;
+use WeChat\Exceptions\InvalidInstanceException;
+
+/**
+ * 加载缓存器
+ *
+ * Class We
+ * @library WeChatDeveloper
+ * @author Anyon<zoujingli@qq.com>
+ * @date 2018/05/24 13:23
+ *
+ * ----- WeChat -----
+ * @method \WeChat\Card WeChatCard($options = []) static 微信卡券管理
+ * @method \WeChat\Custom WeChatCustom($options = []) static 微信客服消息
+ * @method \WeChat\Limit WeChatLimit($options = []) static 接口调用频次限制
+ * @method \WeChat\Media WeChatMedia($options = []) static 微信素材管理
+ * @method \WeChat\Menu WeChatMenu($options = []) static 微信菜单管理
+ * @method \WeChat\Oauth WeChatOauth($options = []) static 微信网页授权
+ * @method \WeChat\Pay WeChatPay($options = []) static 微信支付商户
+ * @method \WeChat\Product WeChatProduct($options = []) static 微信商店管理
+ * @method \WeChat\Qrcode WeChatQrcode($options = []) static 微信二维码管理
+ * @method \WeChat\Receive WeChatReceive($options = []) static 微信推送管理
+ * @method \WeChat\Scan WeChatScan($options = []) static 微信扫一扫接入管理
+ * @method \WeChat\Script WeChatScript($options = []) static 微信前端支持
+ * @method \WeChat\Shake WeChatShake($options = []) static 微信揺一揺周边
+ * @method \WeChat\Tags WeChatTags($options = []) static 微信用户标签管理
+ * @method \WeChat\Template WeChatTemplate($options = []) static 微信模板消息
+ * @method \WeChat\User WeChatUser($options = []) static 微信粉丝管理
+ * @method \WeChat\Wifi WeChatWifi($options = []) static 微信门店WIFI管理
+ *
+ * ----- WeMini -----
+ * @method \WeMini\Crypt WeMiniCrypt($options = []) static 小程序数据加密处理
+ * @method \WeMini\Plugs WeMiniPlugs($options = []) static 小程序插件管理
+ * @method \WeMini\Poi WeMiniPoi($options = []) static 小程序地址管理
+ * @method \WeMini\Qrcode WeMiniQrcode($options = []) static 小程序二维码管理
+ * @method \WeMini\Template WeMiniTemplate($options = []) static 小程序模板消息支持
+ * @method \WeMini\Total WeMiniTotal($options = []) static 小程序数据接口
+ *
+ * ----- WePay -----
+ * @method \WePay\Bill WePayBill($options = []) static 微信商户账单及评论
+ * @method \WePay\Order WePayOrder($options = []) static 微信商户订单
+ * @method \WePay\Refund WePayRefund($options = []) static 微信商户退款
+ * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱
+ * @method \WePay\TransFresBank WePayTransFresBank($options = []) static 微信商户打款到银行卡
+ */
+class We
+{
+    /**
+     * 静态配置
+     * @var array
+     */
+    private static $config;
+
+    /**
+     * 设置及获取参数
+     * @param array $option
+     * @return array
+     */
+    public static function config($option = null)
+    {
+        if (is_array($option)) {
+            self::$config = new DataArray($option);
+        }
+        if (self::$config instanceof DataArray) {
+            return self::$config->get();
+        }
+        return [];
+    }
+
+    /**
+     * @param $name
+     * @param $arguments
+     * @return mixed
+     * @throws InvalidInstanceException
+     */
+    public static function __callStatic($name, $arguments)
+    {
+        if (substr($name, 0, 6) === 'WeChat') {
+            $class = 'WeChat\\' . substr($name, 6);
+        } elseif (substr($name, 0, 6) === 'WeMini') {
+            $class = 'WeMini\\' . substr($name, 6);
+        } elseif (substr($name, 0, 5) === 'WePay') {
+            $class = 'WePay\\' . substr($name, 5);
+        }
+        if (!empty($class) && class_exists($class)) {
+            $option = array_pop($arguments);
+            $config = is_array($option) ? $option : self::$config->get();
+            return new $class($config);
+        }
+        throw new InvalidInstanceException("class {$name} not found");
+    }
+
+}
\ No newline at end of file
diff --git a/WeChat/Exceptions/InvalidInstanceException.php b/WeChat/Exceptions/InvalidInstanceException.php
new file mode 100644
index 0000000..e4c6816
--- /dev/null
+++ b/WeChat/Exceptions/InvalidInstanceException.php
@@ -0,0 +1,40 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeChat\Exceptions;
+
+/**
+ * 加载类异常
+ * Class InvalidInstanceException
+ * @package WeChat\Exceptions
+ */
+class InvalidInstanceException extends \Exception
+{
+    /**
+     * @var array
+     */
+    public $raw = [];
+
+    /**
+     * InvalidResponseException constructor.
+     * @param string $message
+     * @param integer $code
+     * @param array $raw
+     */
+    public function __construct($message, $code = 0, $raw = [])
+    {
+        parent::__construct($message, intval($code));
+        $this->raw = $raw;
+    }
+}
\ No newline at end of file
diff --git a/WeChat/Oauth.php b/WeChat/Oauth.php
index 6ee8fc8..151a4ee 100644
--- a/WeChat/Oauth.php
+++ b/WeChat/Oauth.php
@@ -41,6 +41,7 @@ class Oauth extends BasicWeChat
     /**
      * 通过 code 获取 AccessToken 和 openid
      * @return bool|array
+     * @throws Exceptions\InvalidResponseException
      */
     public function getOauthAccessToken()
     {
@@ -55,6 +56,7 @@ class Oauth extends BasicWeChat
      * 刷新AccessToken并续期
      * @param string $refresh_token
      * @return bool|array
+     * @throws Exceptions\InvalidResponseException
      */
     public function getOauthRefreshToken($refresh_token)
     {
@@ -68,6 +70,7 @@ class Oauth extends BasicWeChat
      * @param string $access_token 网页授权接口调用凭证,注意：此access_token与基础支持的access_token不同
      * @param string $openid 用户的唯一标识
      * @return array
+     * @throws Exceptions\InvalidResponseException
      */
     public function checkOauthAccessToken($access_token, $openid)
     {
@@ -81,6 +84,7 @@ class Oauth extends BasicWeChat
      * @param string $openid 用户的唯一标识
      * @param string $lang 返回国家地区语言版本，zh_CN 简体，zh_TW 繁体，en 英语
      * @return array
+     * @throws Exceptions\InvalidResponseException
      */
     public function getUserInfo($access_token, $openid, $lang = 'zh_CN')
     {
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index ff89411..d3e5f6e 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -15,7 +15,6 @@
 namespace WeChat;
 
 use WeChat\Contracts\BasicPay;
-use WeChat\Contracts\DataArray;
 use WeChat\Exceptions\InvalidResponseException;
 use WePay\Bill;
 use WePay\Order;
@@ -31,18 +30,6 @@ use WePay\TransFresBank;
 class Pay extends BasicPay
 {
 
-    /**
-     * 商户配置
-     * @var DataArray
-     */
-    protected $config;
-
-    /**
-     * 当前请求数据
-     * @var DataArray
-     */
-    protected $params;
-
     /**
      * 统一下单
      * @param array $options
diff --git a/composer.json b/composer.json
index 0351696..371dff3 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,9 @@
     "ext-openssl": "*"
   },
   "autoload": {
+    "classmap": [
+      "We.php"
+    ],
     "psr-4": {
       "WePay\\": "WePay",
       "WeChat\\": "WeChat",
diff --git a/include.php b/include.php
index dfd4e9e..49dc9f8 100644
--- a/include.php
+++ b/include.php
@@ -25,5 +25,8 @@ spl_autoload_register(function ($classname) {
         if (stripos($classname, 'WePay') === 0) {
             include $filename;
         }
+        if ($classname === 'We') {
+            include $filename;
+        }
     }
 });
\ No newline at end of file

From b49701fb057a4c228ffb446d8f38fafac664a462 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 24 May 2018 13:49:46 +0800
Subject: [PATCH 039/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=99=A8=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/We.php b/We.php
index 0f0dbc4..3786d53 100644
--- a/We.php
+++ b/We.php
@@ -82,8 +82,9 @@ class We
     }
 
     /**
-     * @param $name
-     * @param $arguments
+     * 静态魔术加载方法
+     * @param string $name 静态类名
+     * @param array $arguments 参数集合
      * @return mixed
      * @throws InvalidInstanceException
      */

From 6d9b9f71cb9e0ce434692499c6664708dec3e581 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 May 2018 10:21:36 +0800
Subject: [PATCH 040/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=95=86=E6=88=B7=E7=BA=A2=E5=8C=85=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php            |  1 +
 WePay/Redpack.php | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 WePay/Redpack.php

diff --git a/We.php b/We.php
index 3786d53..4acafaf 100644
--- a/We.php
+++ b/We.php
@@ -54,6 +54,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WePay\Bill WePayBill($options = []) static 微信商户账单及评论
  * @method \WePay\Order WePayOrder($options = []) static 微信商户订单
  * @method \WePay\Refund WePayRefund($options = []) static 微信商户退款
+ * @method \WePay\Redpack WePayRedpack($options = []) static 微信红包支持
  * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱
  * @method \WePay\TransFresBank WePayTransFresBank($options = []) static 微信商户打款到银行卡
  */
diff --git a/WePay/Redpack.php b/WePay/Redpack.php
new file mode 100644
index 0000000..8456810
--- /dev/null
+++ b/WePay/Redpack.php
@@ -0,0 +1,69 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WePay;
+
+use WeChat\Contracts\BasicPay;
+
+/**
+ * 微信红包支持
+ * Class Redpack
+ * @package WePay
+ */
+class Redpack extends BasicPay
+{
+
+    /**
+     * 发放普通红包
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function create(array $options)
+    {
+        $this->params->offsetUnset('appid');
+        $this->params->set('wxappid', $this->config->get('appid'));
+        $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack";
+        return $this->callPostApi($url, $options, true);
+    }
+
+    /**
+     * 发放裂变红包
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function groups(array $options)
+    {
+        $this->params->offsetUnset('appid');
+        $this->params->set('wxappid', $this->config->get('appid'));
+        $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendgroupredpack";
+        return $this->callPostApi($url, $options, true);
+    }
+
+    /**
+     * 查询红包记录
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function query(array $options)
+    {
+        $this->params->offsetUnset('wxappid');
+        $this->params->set('appid', $this->config->get('appid'));
+        $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/gethbinfo";
+        return $this->callPostApi($url, $options, true);
+    }
+
+}
\ No newline at end of file

From aacd8a4563f7d97c90b9601b4c9c6c44d8b67bee Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 May 2018 10:28:02 +0800
Subject: [PATCH 041/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=95=86=E6=88=B7=E4=BB=A3=E9=87=91=E5=88=B8?=
 =?UTF-8?q?=E7=B1=BB=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php           |  1 +
 WePay/Coupon.php | 62 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 WePay/Coupon.php

diff --git a/We.php b/We.php
index 4acafaf..9b982cb 100644
--- a/We.php
+++ b/We.php
@@ -54,6 +54,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WePay\Bill WePayBill($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\TransFresBank WePayTransFresBank($options = []) static 微信商户打款到银行卡
diff --git a/WePay/Coupon.php b/WePay/Coupon.php
new file mode 100644
index 0000000..3281048
--- /dev/null
+++ b/WePay/Coupon.php
@@ -0,0 +1,62 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WePay;
+
+use WeChat\Contracts\BasicPay;
+
+/**
+ * 微信商户代金券
+ * Class Coupon
+ * @package WePay
+ */
+class Coupon extends BasicPay
+{
+    /**
+     * 发放代金券
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function create(array $options)
+    {
+        $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/send_coupon";
+        return $this->callPostApi($url, $options, true);
+    }
+
+    /**
+     * 查询代金券批次
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function queryStock(array $options)
+    {
+        $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/query_coupon_stock";
+        return $this->callPostApi($url, $options, false);
+    }
+
+    /**
+     * 查询代金券信息
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function queryInfo(array $options)
+    {
+        $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/query_coupon_stock";
+        return $this->callPostApi($url, $options, false);
+    }
+
+}
\ No newline at end of file

From afb831cbca965ee4b711aefb826d19a8a3512de2 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 May 2018 10:40:08 +0800
Subject: [PATCH 042/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9Asub=5Fmch=5Fid=E5=8F=8Asub=5Fappid=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=94=AF=E6=8C=81(=E4=B9=9F=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=BC=A0=E5=88=B0options=E4=B8=AD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicPay.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicPay.php
index c96f2d9..9c672dc 100644
--- a/WeChat/Contracts/BasicPay.php
+++ b/WeChat/Contracts/BasicPay.php
@@ -61,6 +61,13 @@ class BasicPay
             'mch_id'    => $this->config->get('mch_id'),
             'nonce_str' => Tools::createNoncestr(),
         ]);
+        // 商户参数支持
+        if ($this->config->get('sub_appid')) {
+            $this->params->set('sub_appid', $this->config->get('sub_appid'));
+        }
+        if ($this->config->get('sub_mch_id')) {
+            $this->params->set('sub_mch_id', $this->config->get('sub_mch_id'));
+        }
     }
 
     /**

From 5f10badf781b9a3434dfc2d7067ded83e9b4bfc3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 May 2018 10:42:14 +0800
Subject: [PATCH 043/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicPay.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicPay.php
index 9c672dc..8de0a11 100644
--- a/WeChat/Contracts/BasicPay.php
+++ b/WeChat/Contracts/BasicPay.php
@@ -56,6 +56,7 @@ class BasicPay
             Tools::$cache_path = $options['cache_path'];
         }
         $this->config = new DataArray($options);
+        // 商户基础参数
         $this->params = new DataArray([
             'appid'     => $this->config->get('appid'),
             'mch_id'    => $this->config->get('mch_id'),

From 26419890645299e1850c648ed620f23069949271 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 May 2018 10:47:12 +0800
Subject: [PATCH 044/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B7=E5=8D=A1=E6=94=AF=E4=BB=98=E6=92=A4=E9=94=80=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/Order.php | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/WePay/Order.php b/WePay/Order.php
index e9eca12..bed6af6 100644
--- a/WePay/Order.php
+++ b/WePay/Order.php
@@ -79,18 +79,6 @@ class Order extends BasicPay
         return $option;
     }
 
-    /**
-     * 授权码查询openid
-     * @param string $authCode 扫码支付授权码，设备读取用户微信中的条码或者二维码信息
-     * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
-     */
-    public function queryAuthCode($authCode)
-    {
-        $url = 'https://api.mch.weixin.qq.com/tools/authcodetoopenid';
-        return $this->callPostApi($url, ['auth_code' => $authCode]);
-    }
-
     /**
      * 获取支付规则二维码
      * @param string $productId 商户定义的商品id或者订单号
@@ -110,7 +98,31 @@ class Order extends BasicPay
     }
 
     /**
-     * 交易保障
+     * 刷卡支付 撤销订单
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function reverse(array $options)
+    {
+        $url = 'https://api.mch.weixin.qq.com/secapi/pay/reverse';
+        return $this->callPostApi($url, $options, true);
+    }
+
+    /**
+     * 刷卡支付 授权码查询openid
+     * @param string $authCode 扫码支付授权码，设备读取用户微信中的条码或者二维码信息
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function queryAuthCode($authCode)
+    {
+        $url = 'https://api.mch.weixin.qq.com/tools/authcodetoopenid';
+        return $this->callPostApi($url, ['auth_code' => $authCode]);
+    }
+
+    /**
+     * 刷卡支付 交易保障
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException

From 12052df1505dfb3a6c95ab8892a6c228ae3a366a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 May 2018 16:14:33 +0800
Subject: [PATCH 045/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php                                         | 2 +-
 WeChat/Pay.php                                 | 6 +++---
 WePay/{TransFresBank.php => TransfersBank.php} | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename WePay/{TransFresBank.php => TransfersBank.php} (99%)

diff --git a/We.php b/We.php
index 9b982cb..f7e23ff 100644
--- a/We.php
+++ b/We.php
@@ -57,7 +57,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券
  * @method \WePay\Redpack WePayRedpack($options = []) static 微信红包支持
  * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱
- * @method \WePay\TransFresBank WePayTransFresBank($options = []) static 微信商户打款到银行卡
+ * @method \WePay\TransfersBank WePayTransFresBank($options = []) static 微信商户打款到银行卡
  */
 class We
 {
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index d3e5f6e..de595d9 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -20,7 +20,7 @@ use WePay\Bill;
 use WePay\Order;
 use WePay\Refund;
 use WePay\Transfers;
-use WePay\TransFresBank;
+use WePay\TransfersBank;
 
 /**
  * 微信支付商户
@@ -197,7 +197,7 @@ class Pay extends BasicPay
      */
     public function createTransfersBank(array $options)
     {
-        $pay = new TransFresBank($this->config->get());
+        $pay = new TransfersBank($this->config->get());
         return $pay->create($options);
     }
 
@@ -209,7 +209,7 @@ class Pay extends BasicPay
      */
     public function queryTransFresBank($partner_trade_no)
     {
-        $pay = new TransFresBank($this->config->get());
+        $pay = new TransfersBank($this->config->get());
         return $pay->query($partner_trade_no);
     }
 }
\ No newline at end of file
diff --git a/WePay/TransFresBank.php b/WePay/TransfersBank.php
similarity index 99%
rename from WePay/TransFresBank.php
rename to WePay/TransfersBank.php
index b4400d2..0ff82a5 100644
--- a/WePay/TransFresBank.php
+++ b/WePay/TransfersBank.php
@@ -25,7 +25,7 @@ use WeChat\Exceptions\InvalidResponseException;
  * Class TransFresBank
  * @package WePay
  */
-class TransFresBank extends BasicPay
+class TransfersBank extends BasicPay
 {
 
     /**

From 9d9a94593be581edde442e19b99ccc7fe11f376d Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 May 2018 16:25:32 +0800
Subject: [PATCH 046/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4(=E9=9D=9E=E5=BF=85=E8=A6=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/Transfers.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WePay/Transfers.php b/WePay/Transfers.php
index 410aa8b..f86d147 100644
--- a/WePay/Transfers.php
+++ b/WePay/Transfers.php
@@ -32,10 +32,10 @@ class Transfers extends BasicPay
      */
     public function create(array $options)
     {
-        $this->params->set('mchid', $this->config->get('mch_id'));
-        $this->params->set('mch_appid', $this->config->get('appid'));
         $this->params->offsetUnset('appid');
         $this->params->offsetUnset('mch_id');
+        $this->params->set('mchid', $this->config->get('mch_id'));
+        $this->params->set('mch_appid', $this->config->get('appid'));
         $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers';
         return $this->callPostApi($url, $options, true, 'MD5', false);
     }
@@ -48,11 +48,11 @@ class Transfers extends BasicPay
      */
     public function query($partnerTradeNo)
     {
-        $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
-        $this->params->set('appid', $this->config->get('appid'));
-        $this->params->set('mch_id', $this->config->get('mch_id'));
         $this->params->offsetUnset('mchid');
         $this->params->offsetUnset('mch_appid');
+        $this->params->set('appid', $this->config->get('appid'));
+        $this->params->set('mch_id', $this->config->get('mch_id'));
+        $url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/gettransferinfo';
         return $this->callPostApi($url, ['partner_trade_no' => $partnerTradeNo], true, 'MD5', false);
     }
 

From cf8eb26a0ada0d9ae3fd50a6c6e34f5c19cf7255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sun, 27 May 2018 21:54:20 +0800
Subject: [PATCH 047/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=BA=A2=E5=8C=85=E7=AD=BE=E5=90=8D=E5=8F=8A?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/Redpack.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/WePay/Redpack.php b/WePay/Redpack.php
index 8456810..e4c74b1 100644
--- a/WePay/Redpack.php
+++ b/WePay/Redpack.php
@@ -35,7 +35,7 @@ class Redpack extends BasicPay
         $this->params->offsetUnset('appid');
         $this->params->set('wxappid', $this->config->get('appid'));
         $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack";
-        return $this->callPostApi($url, $options, true);
+        return $this->callPostApi($url, $options, true, 'MD5', false);
     }
 
     /**
@@ -49,21 +49,21 @@ class Redpack extends BasicPay
         $this->params->offsetUnset('appid');
         $this->params->set('wxappid', $this->config->get('appid'));
         $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendgroupredpack";
-        return $this->callPostApi($url, $options, true);
+        return $this->callPostApi($url, $options, true, 'MD5', false);
     }
 
     /**
      * 查询红包记录
-     * @param array $options
+     * @param array $mch_billno 商户发放红包的商户订单号
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function query(array $options)
+    public function query($mch_billno)
     {
         $this->params->offsetUnset('wxappid');
         $this->params->set('appid', $this->config->get('appid'));
         $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/gethbinfo";
-        return $this->callPostApi($url, $options, true);
+        return $this->callPostApi($url, ['mch_billno' => $mch_billno, 'bill_type' => 'MCHT'], true, 'MD5', false);
     }
 
 }
\ No newline at end of file

From 80322423e8fd52217d849b4409a1e7351bf06ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sun, 27 May 2018 21:56:22 +0800
Subject: [PATCH 048/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8F=8F=E8=BF=B0=E5=8F=8A=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/Redpack.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WePay/Redpack.php b/WePay/Redpack.php
index e4c74b1..4da8975 100644
--- a/WePay/Redpack.php
+++ b/WePay/Redpack.php
@@ -54,16 +54,16 @@ class Redpack extends BasicPay
 
     /**
      * 查询红包记录
-     * @param array $mch_billno 商户发放红包的商户订单号
+     * @param string $mchBillno 商户发放红包的商户订单号
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function query($mch_billno)
+    public function query($mchBillno)
     {
         $this->params->offsetUnset('wxappid');
         $this->params->set('appid', $this->config->get('appid'));
         $url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/gethbinfo";
-        return $this->callPostApi($url, ['mch_billno' => $mch_billno, 'bill_type' => 'MCHT'], true, 'MD5', false);
+        return $this->callPostApi($url, ['mch_billno' => $mchBillno, 'bill_type' => 'MCHT'], true, 'MD5', false);
     }
 
 }
\ No newline at end of file

From 0cc8b41cb8469c0a0f28652c06aa825d364cec02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sun, 27 May 2018 22:33:47 +0800
Subject: [PATCH 049/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/We.php b/We.php
index f7e23ff..329c939 100644
--- a/We.php
+++ b/We.php
@@ -63,7 +63,7 @@ class We
 {
     /**
      * 静态配置
-     * @var array
+     * @var DataArray
      */
     private static $config;
 

From fd179277a64b5435140617ef2fa3a2420d55795e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sun, 27 May 2018 22:38:28 +0800
Subject: [PATCH 050/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=99=A8=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/We.php b/We.php
index 329c939..9ecd8df 100644
--- a/We.php
+++ b/We.php
@@ -57,7 +57,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WePay\Coupon WePayCoupon($options = []) static 微信商户代金券
  * @method \WePay\Redpack WePayRedpack($options = []) static 微信红包支持
  * @method \WePay\Transfers WePayTransfers($options = []) static 微信商户打款到零钱
- * @method \WePay\TransfersBank WePayTransFresBank($options = []) static 微信商户打款到银行卡
+ * @method \WePay\TransfersBank WePayTransfersBank($options = []) static 微信商户打款到银行卡
  */
 class We
 {

From 34b23677e8dcced48ab950f3c76cda0d7d57a7d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sun, 27 May 2018 22:42:25 +0800
Subject: [PATCH 051/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3W?=
 =?UTF-8?q?e=E5=BF=AB=E9=80=9F=E5=8A=A0=E8=BD=BD=E5=99=A8=E5=8F=96?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/We.php b/We.php
index 9ecd8df..f18b422 100644
--- a/We.php
+++ b/We.php
@@ -100,7 +100,7 @@ class We
             $class = 'WePay\\' . substr($name, 5);
         }
         if (!empty($class) && class_exists($class)) {
-            $option = array_pop($arguments);
+            $option = array_shift($arguments);
             $config = is_array($option) ? $option : self::$config->get();
             return new $class($config);
         }

From ff36d0b26848eef5aa9d507eae44d7c8dafb04eb Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 29 May 2018 10:10:45 +0800
Subject: [PATCH 052/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8D=A1=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Card.php | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/WeChat/Card.php b/WeChat/Card.php
index 4b32879..59cba2d 100644
--- a/WeChat/Card.php
+++ b/WeChat/Card.php
@@ -388,6 +388,65 @@ class Card extends BasicWeChat
         return $this->httpPostForJson($url, $data);
     }
 
+
+    /**
+     * 激活会员卡
+     * @param array $data
+     * @return array
+     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     */
+    public function activateMemberCard(array $data)
+    {
+        $url = 'https://api.weixin.qq.com/card/membercard/activate?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->httpPostForJson($url, $data);
+    }
+
+    /**
+     * 设置开卡字段接口
+     * 用户激活时需要填写的选项
+     * @param array $data
+     * @return array
+     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     */
+    public function setActivateMemberCardUser(array $data)
+    {
+        $url = 'https://api.weixin.qq.com/card/membercard/activateuserform/set?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->httpPostForJson($url, $data);
+    }
+
+    /**
+     * 获取用户提交资料
+     * 根据activate_ticket获取到用户填写的信息
+     * @param string $activate_ticket
+     * @return array
+     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     */
+    public function getActivateMemberCardTempinfo($activate_ticket)
+    {
+        $url = 'https://api.weixin.qq.com/card/membercard/activatetempinfo/get?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->httpPostForJson($url, ['activate_ticket' => $activate_ticket]);
+    }
+
+    /**
+     * 更新会员信息
+     * @param array $data
+     * @return array
+     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     */
+    public function updateMemberCardUser(array $data)
+    {
+        $url = 'https://api.weixin.qq.com/card/membercard/updateuser?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->httpPostForJson($url, $data);
+    }
+
     /**
      * 拉取会员卡概况数据接口
      * @param string $begin_date 查询数据的起始时间
@@ -612,5 +671,4 @@ class Card extends BasicWeChat
     }
 
 
-
 }
\ No newline at end of file

From fa4ecd99047a2aae73547eb124a972594b6a8fa6 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 31 May 2018 17:29:03 +0800
Subject: [PATCH 053/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0W?=
 =?UTF-8?q?e=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/We.php b/We.php
index f18b422..0173f07 100644
--- a/We.php
+++ b/We.php
@@ -61,6 +61,12 @@ use WeChat\Exceptions\InvalidInstanceException;
  */
 class We
 {
+    /**
+     * 定义当前版本
+     * @var string
+     */
+    const VERSION = '1.1.11';
+
     /**
      * 静态配置
      * @var DataArray

From ef6febfcad931ebf402bebc6e45415ccc11a0522 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 4 Jun 2018 17:20:54 +0800
Subject: [PATCH 054/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 90e23bb..1e6d77f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
-[![Latest Stable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/stable)](https://packagist.org/packages/zoujingli/wechat-developer) [![Latest Unstable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/unstable)](https://packagist.org/packages/zoujingli/wechat-developer) [![Total Downloads](https://poser.pugx.org/zoujingli/wechat-developer/downloads)](https://packagist.org/packages/wechat-developer) [![License](https://poser.pugx.org/zoujingli/wechat-developer/license)](https://packagist.org/packages/wechat-developer)
+[![Latest Stable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/stable)](https://packagist.org/packages/zoujingli/wechat-developer) 
+[![Latest Unstable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/unstable)](https://packagist.org/packages/zoujingli/wechat-developer) 
+[![Total Downloads](https://poser.pugx.org/zoujingli/wechat-developer/downloads)](https://packagist.org/packages/zoujingli/wechat-developer) 
+[![License](https://poser.pugx.org/zoujingli/wechat-developer/license)](https://packagist.org/packages/zoujingli/wechat-developer)
 
 WeChatDeveloper for PHP
 --

From 1e608beeb3cdf8da72f373aec105cd7d575b9f32 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 7 Jun 2018 11:34:47 +0800
Subject: [PATCH 055/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E7=B1=BB=E5=90=8D=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/TransfersBank.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WePay/TransfersBank.php b/WePay/TransfersBank.php
index 0ff82a5..1564e6f 100644
--- a/WePay/TransfersBank.php
+++ b/WePay/TransfersBank.php
@@ -22,7 +22,7 @@ use WeChat\Exceptions\InvalidResponseException;
 
 /**
  * 微信商户打款到银行卡
- * Class TransFresBank
+ * Class TransfersBank
  * @package WePay
  */
 class TransfersBank extends BasicPay

From a9f8a8952536b0c7713c3ed8655bef8ce8108ede Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Jun 2018 17:01:38 +0800
Subject: [PATCH 056/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E8=AE=A2=E5=8D=95=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/Bill.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WePay/Bill.php b/WePay/Bill.php
index d24b929..e0767ae 100644
--- a/WePay/Bill.php
+++ b/WePay/Bill.php
@@ -53,7 +53,7 @@ class Bill extends BasicPay
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function commtent(array $options)
+    public function comment(array $options)
     {
         $url = 'https://api.mch.weixin.qq.com/billcommentsp/batchquerycomment';
         return $this->callPostApi($url, $options, true);

From 9957f449f7109f7b30574120aaed4c46a9ddd8fb Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Jun 2018 17:04:11 +0800
Subject: [PATCH 057/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9S?=
 =?UTF-8?q?DK=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/We.php b/We.php
index 0173f07..f8891d9 100644
--- a/We.php
+++ b/We.php
@@ -65,7 +65,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.1.11';
+    const VERSION = '1.1.12';
 
     /**
      * 静态配置

From 5daa001da4fdf40d30810c29ebe4f34576997185 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Jun 2018 17:51:54 +0800
Subject: [PATCH 058/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/README.md b/README.md
index 1e6d77f..92b49c3 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,39 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
 * Gitee 托管地址：https://gitee.com/zoujingli/WeChatDeveloper
 * GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
 
+ClassMap
+--
+|  文件名  |  类名  |  描述 | 类型 | 加载 ① |
+| --- | --- | --- | --- | --- | --- |
+|  Card.php  | WeChat\Card   |  微信卡券接口支持  | 认证服务号 | \We::WeChatCard() |
+|  Custom.php  | WeChat\Custom   |  微信客服消息接口支持   |  认证服务号 | \We::WeChatCustom() |
+|  Media.php  | WeChat\Media   |  微信媒体素材接口支持  |  认证服务号 | \We::WeChatMedia() |
+|  Oauth.php  | WeChat\Oauth   |  微信网页授权消息类接口  |  认证服务号 | \We::WeChatOauth() |
+|  Pay.php  | WeChat\Pay   |  微信支付类接口  |  认证服务号 | \We::WeChatPay() |
+|  Product.php  | WeChat\Product   |  微信商店类接口  |  认证服务号 | \We::WeChatProduct() |
+|  Qrcode.php  | WeChat\Qrcode   |  微信二维码接口支持  |  认证服务号 | \We::WeChatQrcode() |
+|  Receive.php  | WeChat\Receive   |  微信推送事件消息处理支持 |  认证服务号 | \We::WeChatReceive() |
+|  Scan.php  | WeChat\Scan   |  微信扫一扫接口支持  |  认证服务号 | \We::WeChatScan() |
+|  Script.php  | WeChat\Script   |  微信前端JSSDK支持  |  认证服务号 | \We::WeChatScript() |
+|  Shake.php  | WeChat\Shake   |  微信蓝牙设备揺一揺接口  |  认证服务号 | \We::WeChatShake() |
+|  Tags.php  | WeChat\Tags   |  微信粉丝标签接口支持  |  认证服务号 | \We::WeChatTags() |
+|  Template.php  | WeChat\Template   |  微信模板消息接口支持  |  认证服务号 | \We::WeChatTemplate() |
+|  User.php  | WeChat\User   |  微信粉丝管理接口支持  |  认证服务号 | \We::WeChatCard() |
+|  Wifi.php  | WeChat\Wifi   |  微信门店WIFI管理支持  |  认证服务号 | \We::WeChatWifi() |
+|  Bill.php  | WePay\Bill   |  微信商户账单及评论  | 微信支付 | \We::WePayBill() |
+|  Coupon.php  | WePay\Coupon   |  微信商户代金券  |  微信支付 | \We::WePayCoupon() |
+|  Order.php  | WePay\Order   |  微信商户订单  |  微信支付 | \We::WePayOrder() |
+|  Redpack.php  | WePay\Redpack   |  微信红包支持  |  微信支付 | \We::WePayRedpack() |
+|  Refund.php  | WePay\Refund   |  微信商户退款  |  微信支付 | \We::WePayRefund() |
+|  Transfers.php  | WePay\Transfers   |  微信商户打款到零钱  |   微信支付 | \We::WePayTransfers() |
+|  TransfersBank.php  | WePay\TransfersBank   |  微信商户打款到银行卡  |  微信支付 | \We::WePayTransfersBank() |
+|  Crypt.php  | WeMini\Crypt   |  数据加密处理  |  微信小程序 | \We::WeMiniCrypt() |
+|  Plugs.php  | WeMini\Plugs   |  微信小程序插件管理  |  微信小程序 | \We::WeMiniPlugs() |
+|  Poi.php  | WeMini\Poi   |  微信小程序地址管理  |  微信小程序 | \We::WeMiniPoi() |
+|  Qrcode.php  | WeMini\Qrcode   |  微信小程序二维码管理  | 微信小程序 | \We::WeMiniCrypt() |
+|  Template.php  | WeMini\Template   |  公众号小程序模板消息支持  | 微信小程序 | \We::WeMiniTemplate() |
+|  Total.php  | WeMini\Total   |  微信小程序数据接口  | 微信小程序 | \We::WeMiniTotal() |
+
 
 Install
 --

From d2815e23d178557115c30ccf3aded5dd3f21b5fe Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Jun 2018 17:52:37 +0800
Subject: [PATCH 059/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 92b49c3..1ebd42a 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
 
 ClassMap
 --
+
 |  文件名  |  类名  |  描述 | 类型 | 加载 ① |
 | --- | --- | --- | --- | --- | --- |
 |  Card.php  | WeChat\Card   |  微信卡券接口支持  | 认证服务号 | \We::WeChatCard() |

From 3f0fb7e3f2aaf5bddaf6f09cda3f5d9230d4d66e Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Jun 2018 17:55:33 +0800
Subject: [PATCH 060/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1ebd42a..089abed 100644
--- a/README.md
+++ b/README.md
@@ -37,9 +37,10 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
 ClassMap
 --
 
-|  文件名  |  类名  |  描述 | 类型 | 加载 ① |
-| --- | --- | --- | --- | --- | --- |
-|  Card.php  | WeChat\Card   |  微信卡券接口支持  | 认证服务号 | \We::WeChatCard() |
+
+|文件名|类名|描述|类型|加载 ①|
+|---|---|---|---|---|
+|  Card.php  |  WeChat\Card  |  微信卡券接口支持  |  认证服务号  |  \We::WeChatCard() |
 |  Custom.php  | WeChat\Custom   |  微信客服消息接口支持   |  认证服务号 | \We::WeChatCustom() |
 |  Media.php  | WeChat\Media   |  微信媒体素材接口支持  |  认证服务号 | \We::WeChatMedia() |
 |  Oauth.php  | WeChat\Oauth   |  微信网页授权消息类接口  |  认证服务号 | \We::WeChatOauth() |

From 2faf74d69d2a15f0ba7d7739c3a31f3fe73f346c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Jun 2018 17:59:02 +0800
Subject: [PATCH 061/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index 089abed..d76db46 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ ClassMap
 |  Refund.php  | WePay\Refund   |  微信商户退款  |  微信支付 | \We::WePayRefund() |
 |  Transfers.php  | WePay\Transfers   |  微信商户打款到零钱  |   微信支付 | \We::WePayTransfers() |
 |  TransfersBank.php  | WePay\TransfersBank   |  微信商户打款到银行卡  |  微信支付 | \We::WePayTransfersBank() |
-|  Crypt.php  | WeMini\Crypt   |  数据加密处理  |  微信小程序 | \We::WeMiniCrypt() |
+|  Crypt.php  | WeMini\Crypt   |  微信小程序数据加密处理  |  微信小程序 | \We::WeMiniCrypt() |
 |  Plugs.php  | WeMini\Plugs   |  微信小程序插件管理  |  微信小程序 | \We::WeMiniPlugs() |
 |  Poi.php  | WeMini\Poi   |  微信小程序地址管理  |  微信小程序 | \We::WeMiniPoi() |
 |  Qrcode.php  | WeMini\Qrcode   |  微信小程序二维码管理  | 微信小程序 | \We::WeMiniCrypt() |

From 5416185bc1d916d011a6b1c4f2477787c7b29a81 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 13 Jun 2018 19:12:17 +0800
Subject: [PATCH 062/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index d76db46..b3816a7 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ ClassMap
 |  Plugs.php  | WeMini\Plugs   |  微信小程序插件管理  |  微信小程序 | \We::WeMiniPlugs() |
 |  Poi.php  | WeMini\Poi   |  微信小程序地址管理  |  微信小程序 | \We::WeMiniPoi() |
 |  Qrcode.php  | WeMini\Qrcode   |  微信小程序二维码管理  | 微信小程序 | \We::WeMiniCrypt() |
-|  Template.php  | WeMini\Template   |  公众号小程序模板消息支持  | 微信小程序 | \We::WeMiniTemplate() |
+|  Template.php  | WeMini\Template   |  微信小程序模板消息支持  | 微信小程序 | \We::WeMiniTemplate() |
 |  Total.php  | WeMini\Total   |  微信小程序数据接口  | 微信小程序 | \We::WeMiniTotal() |
 
 

From 31fce9dfa09529f49b41ebcc912cf5d0cb5f55d9 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 14 Jun 2018 10:05:59 +0800
Subject: [PATCH 063/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E6=8F=8F=E8=BF=B0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/TransfersBank.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WePay/TransfersBank.php b/WePay/TransfersBank.php
index 1564e6f..fba82fd 100644
--- a/WePay/TransfersBank.php
+++ b/WePay/TransfersBank.php
@@ -53,7 +53,7 @@ class TransfersBank extends BasicPay
         if (!isset($options['amount'])) {
             throw new InvalidArgumentException('Missing Options -- [amount]');
         }
-        isset($options['desc']) && $this->config['desc'] = $options['desc'];
+        isset($options['desc']) && $this->params['desc'] = $options['desc'];
         $this->params->offsetUnset('appid');
         return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
             'amount'           => $options['amount'],

From a9b26e38976aa90df25c8b499e26cc2542b022f9 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 14 Jun 2018 10:12:58 +0800
Subject: [PATCH 064/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E6=8F=8F=E8=BF=B0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePay/TransfersBank.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WePay/TransfersBank.php b/WePay/TransfersBank.php
index fba82fd..f53aacb 100644
--- a/WePay/TransfersBank.php
+++ b/WePay/TransfersBank.php
@@ -53,7 +53,7 @@ class TransfersBank extends BasicPay
         if (!isset($options['amount'])) {
             throw new InvalidArgumentException('Missing Options -- [amount]');
         }
-        isset($options['desc']) && $this->params['desc'] = $options['desc'];
+        isset($options['desc']) && $this->params->set('desc', $options['desc']);
         $this->params->offsetUnset('appid');
         return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
             'amount'           => $options['amount'],

From 8a38e241609b99bc0378f1a2f665045e908237d2 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 19 Jun 2018 10:21:32 +0800
Subject: [PATCH 065/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=20=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E5=A2=9E=E5=8A=A0toXml=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=8F=AF=E7=94=A8=E4=BA=8E=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicPay.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicPay.php
index 8de0a11..22118fc 100644
--- a/WeChat/Contracts/BasicPay.php
+++ b/WeChat/Contracts/BasicPay.php
@@ -120,6 +120,22 @@ class BasicPay
         return $this->callPostApi($url, ['long_url' => $longUrl]);
     }
 
+
+    /**
+     * 数组直接转xml数据输出
+     * @param array $data
+     * @param bool $isReturn
+     * @return string
+     */
+    public function toXml(array $data, $isReturn = false)
+    {
+        $xml = Tools::arr2xml($data);
+        if ($isReturn) {
+            return $xml;
+        }
+        echo $xml;
+    }
+
     /**
      * 以Post请求接口
      * @param string $url 请求

From 39682a047e5c8f9c66107924dfed4e2080e97eb4 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 11 Jul 2018 10:02:41 +0800
Subject: [PATCH 066/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]xml=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AE=89=E5=85=A8=E5=A4=84=E7=90=86=20#11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index a9bf0a9..247bfe6 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -143,7 +143,10 @@ class Tools
      */
     public static function xml2arr($xml)
     {
-        return json_decode(self::arr2json(simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA)), true);
+        $entity = libxml_disable_entity_loader(true);
+        $data = (array)simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA);
+        libxml_disable_entity_loader($entity);
+        return json_decode(self::arr2json($data), true);
     }
 
     /**

From b07f4b9924497d96f845e69d5eb4e30a5b46d6b5 Mon Sep 17 00:00:00 2001
From: gaoyiping <iam@gaoyiping.com>
Date: Sat, 14 Jul 2018 15:58:31 +0800
Subject: [PATCH 067/161] =?UTF-8?q?add:=20=E7=94=A8=E6=88=B7=E5=8F=AF?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E8=AE=BE=E7=BD=AEAccessToken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicWeChat.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 83c9a3d..df01cb4 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -108,6 +108,28 @@ class BasicWeChat
         return $this->access_token = $result['access_token'];
     }
 
+    /**
+     * 直接设置accessToken
+     * @param string $access_token
+     * @return void
+     * @throws \WeCaht\Exceptions\InvalidArgumentException
+     * @author 高一平 <iam@gaoyiping.com>
+     *
+     * 当用户使用自己的缓存驱动时，直接实例化对象后可直接设置AccessToekn
+     * - 多用于分布式项目时保持AccessToekn统一
+     * - 使用此方法后就由用户来保证传入的AccessToekn为有效AccessToekn
+     */
+    public function setAccessToken($access_token) {
+        if (!is_string($access_token)) {
+            throw new InvalidArgumentException("Invalid AccessToken type, need string.");
+        }
+        // 使用默认获取access_token的方法
+        if (is_null($access_token) || empty($access_token)) {
+            $this->access_token = '';
+        }
+        $this->access_token = $access_token;
+    }
+
     /**
      * 清理删除accessToken
      * @return bool

From 327b841c62b58fa5548d92da0a0c5c9bfd580e78 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 14 Jul 2018 16:18:11 +0800
Subject: [PATCH 068/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEaccesstoken=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicWeChat.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index df01cb4..30bbc25 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -109,25 +109,22 @@ class BasicWeChat
     }
 
     /**
-     * 直接设置accessToken
+     * 设置外部接口 AccessToken
      * @param string $access_token
-     * @return void
-     * @throws \WeCaht\Exceptions\InvalidArgumentException
+     * @throws \WeChat\Exceptions\LocalCacheException
      * @author 高一平 <iam@gaoyiping.com>
      *
-     * 当用户使用自己的缓存驱动时，直接实例化对象后可直接设置AccessToekn
-     * - 多用于分布式项目时保持AccessToekn统一
-     * - 使用此方法后就由用户来保证传入的AccessToekn为有效AccessToekn
+     * 当用户使用自己的缓存驱动时，直接实例化对象后可直接设置 AccessToekn
+     * - 多用于分布式项目时保持 AccessToken 统一
+     * - 使用此方法后就由用户来保证传入的 AccessToekn 为有效 AccessToekn
      */
-    public function setAccessToken($access_token) {
+    public function setAccessToken($access_token)
+    {
         if (!is_string($access_token)) {
             throw new InvalidArgumentException("Invalid AccessToken type, need string.");
         }
-        // 使用默认获取access_token的方法
-        if (is_null($access_token) || empty($access_token)) {
-            $this->access_token = '';
-        }
-        $this->access_token = $access_token;
+        $cache = $this->config->get('appid') . '_access_token';
+        Tools::setCache($cache, $this->access_token = $access_token);
     }
 
     /**

From 733e1084699d394080b5748e60434bd8d5173ebd Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 12 Sep 2018 14:10:27 +0800
Subject: [PATCH 069/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=9C=8D=E5=8E=BB=E9=99=A4=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Custom.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/WeChat/Custom.php b/WeChat/Custom.php
index bdd2887..8f1c9d7 100644
--- a/WeChat/Custom.php
+++ b/WeChat/Custom.php
@@ -28,14 +28,13 @@ class Custom extends BasicWeChat
      * 添加客服帐号
      * @param string $kf_account 客服账号
      * @param string $nickname 客服昵称
-     * @param string $password 账号密码
      * @return array
      * @throws Exceptions\InvalidResponseException
      * @throws Exceptions\LocalCacheException
      */
-    public function addAccount($kf_account, $nickname, $password)
+    public function addAccount($kf_account, $nickname)
     {
-        $data = ['kf_account' => $kf_account, 'nickname' => $nickname, 'password' => $password];
+        $data = ['kf_account' => $kf_account, 'nickname' => $nickname];
         $url = "https://api.weixin.qq.com/customservice/kfaccount/add?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->httpPostForJson($url, $data);

From 328d21d32c3d06f5f050185a740f00fe475b6a03 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 12 Sep 2018 14:12:49 +0800
Subject: [PATCH 070/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=9C=8D=E5=8E=BB=E9=99=A4=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Custom.php | 11 ++++-------
 WePay/Refund.php  | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/WeChat/Custom.php b/WeChat/Custom.php
index 8f1c9d7..12e5051 100644
--- a/WeChat/Custom.php
+++ b/WeChat/Custom.php
@@ -44,14 +44,13 @@ class Custom extends BasicWeChat
      * 修改客服帐号
      * @param string $kf_account 客服账号
      * @param string $nickname 客服昵称
-     * @param string $password 账号密码
      * @return array
      * @throws Exceptions\InvalidResponseException
      * @throws Exceptions\LocalCacheException
      */
-    public function updateAccount($kf_account, $nickname, $password)
+    public function updateAccount($kf_account, $nickname)
     {
-        $data = ['kf_account' => $kf_account, 'nickname' => $nickname, 'password' => $password];
+        $data = ['kf_account' => $kf_account, 'nickname' => $nickname];
         $url = "https://api.weixin.qq.com/customservice/kfaccount/update?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->httpPostForJson($url, $data);
@@ -60,15 +59,13 @@ class Custom extends BasicWeChat
     /**
      * 删除客服帐号
      * @param string $kf_account 客服账号
-     * @param string $nickname 客服昵称
-     * @param string $password 账号密码
      * @return array
      * @throws Exceptions\InvalidResponseException
      * @throws Exceptions\LocalCacheException
      */
-    public function deleteAccount($kf_account, $nickname, $password)
+    public function deleteAccount($kf_account)
     {
-        $data = ['kf_account' => $kf_account, 'nickname' => $nickname, 'password' => $password];
+        $data = ['kf_account' => $kf_account];
         $url = "https://api.weixin.qq.com/customservice/kfaccount/del?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->httpPostForJson($url, $data);
diff --git a/WePay/Refund.php b/WePay/Refund.php
index a91493e..da81522 100644
--- a/WePay/Refund.php
+++ b/WePay/Refund.php
@@ -15,6 +15,8 @@
 namespace WePay;
 
 use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\Tools;
+use WeChat\Exceptions\InvalidResponseException;
 
 /**
  * 微信商户退款
@@ -48,4 +50,27 @@ class Refund extends BasicPay
         return $this->callPostApi($url, $options);
     }
 
+    /**
+     * 获取退款通知
+     * @return array
+     * @throws InvalidResponseException
+     */
+    public function getNotify()
+    {
+        $data = Tools::xml2arr(file_get_contents("php://input"));
+        if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') {
+            throw new InvalidResponseException('获取退款通知XML失败！');
+        }
+        if (!class_exists('Prpcrypt', false)) {
+            include dirname(__DIR__) . '/WeChat/Contracts/Prpcrypt.php';
+        }
+        $pc = new \Prpcrypt(md5($this->config->get('mch_key')));
+        $array = $pc->decrypt(base64_decode($data['req_info']));
+        if (intval($array[0]) > 0) {
+            throw new InvalidResponseException($array[1], $array[0]);
+        }
+        $data['decode'] = $array[1];
+        return $data;
+    }
+
 }
\ No newline at end of file

From 60e032cdf60aa0ef31f28b2fa1704e5ee6c3a477 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 23 Oct 2018 18:58:53 +0800
Subject: [PATCH 071/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE=E5=88=B0=E9=93=B6=E8=A1=8C?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8D=95=E7=8B=ACp12=E8=AF=81=E4=B9=A6=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/config.php                  |  3 +-
 WeChat/Contracts/BasicPay.php    | 29 +++++++++++++------
 WeChat/Contracts/BasicWeChat.php |  2 +-
 WeChat/Contracts/Tools.php       | 48 ++++++++++++++++++++------------
 WePay/TransfersBank.php          |  5 ++--
 composer.json                    |  1 +
 6 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/Test/config.php b/Test/config.php
index 48fdd4a..403f7ef 100644
--- a/Test/config.php
+++ b/Test/config.php
@@ -20,7 +20,8 @@ return [
     // 配置商户支付参数
     'mch_id'         => "1332187001",
     'mch_key'        => 'A82DC5BD1F3359081049C568D8502BC5',
-    // 配置商户支付双向证书目录
+    // 配置商户支付双向证书目录 （p12 | key,cert 二选一，两者都配置时p12优先）
+    // 'ssl_p12'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.p12',
     'ssl_key'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_key.pem',
     'ssl_cer'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.pem',
     // 配置缓存目录，需要拥有写权限
diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicPay.php
index 22118fc..646cb6c 100644
--- a/WeChat/Contracts/BasicPay.php
+++ b/WeChat/Contracts/BasicPay.php
@@ -53,7 +53,7 @@ class BasicPay
             throw new InvalidArgumentException("Missing Config -- [mch_key]");
         }
         if (!empty($options['cache_path'])) {
-            Tools::$cache_path = $options['cache_path'];
+            Tools::$CachePath = $options['cache_path'];
         }
         $this->config = new DataArray($options);
         // 商户基础参数
@@ -79,10 +79,8 @@ class BasicPay
     public function getNotify()
     {
         $data = Tools::xml2arr(file_get_contents('php://input'));
-        if (!empty($data['sign'])) {
-            if ($this->getPaySign($data) === $data['sign']) {
-                return $data;
-            }
+        if (isset($data['sign']) && $this->getPaySign($data) === $data['sign']) {
+            return $data;
         }
         throw new InvalidResponseException('Invalid Notify.', '0');
     }
@@ -96,7 +94,6 @@ class BasicPay
      */
     public function getPaySign(array $data, $signType = 'MD5', $buff = '')
     {
-        unset($data['sign']);
         ksort($data);
         foreach ($data as $k => $v) {
             $buff .= "{$k}={$v}&";
@@ -112,7 +109,8 @@ class BasicPay
      * 转换短链接
      * @param string $longUrl 需要转换的URL，签名用原串，传输需URLencode
      * @return array
-     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\ExcInvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function shortUrl($longUrl)
     {
@@ -145,22 +143,35 @@ class BasicPay
      * @param bool $needSignType 是否需要传签名类型参数
      * @return array
      * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true)
     {
         $option = [];
         if ($isCert) {
+            $option['ssl_p12'] = $this->config->get('ssl_p12');
             $option['ssl_cer'] = $this->config->get('ssl_cer');
             $option['ssl_key'] = $this->config->get('ssl_key');
-            if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer']))
+            if (is_string($option['ssl_p12']) && file_exists($option['ssl_p12'])) {
+                $content = file_get_contents($option['ssl_p12']);
+                if (openssl_pkcs12_read($content, $certs, $this->config->get('mch_id'))) {
+                    $option['ssl_key'] = Tools::pushFile(md5($certs['pkey']) . '.pem', $certs['pkey']);
+                    $option['ssl_cer'] = Tools::pushFile(md5($certs['cert']) . '.pem', $certs['cert']);
+                } else throw new InvalidArgumentException("P12 certificate does not match MCH_ID --- ssl_p12");
+            }
+            if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer'])) {
                 throw new InvalidArgumentException("Missing Config -- ssl_cer", '0');
-            if (empty($option['ssl_key']) || !file_exists($option['ssl_key']))
+            }
+            if (empty($option['ssl_key']) || !file_exists($option['ssl_key'])) {
                 throw new InvalidArgumentException("Missing Config -- ssl_key", '0');
+            }
         }
         $params = $this->params->merge($data);
         $needSignType && ($params['sign_type'] = strtoupper($signType));
         $params['sign'] = $this->getPaySign($params, $signType);
+        print_r($params);
         $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
+        print_r($result);
         if ($result['return_code'] !== 'SUCCESS') {
             throw new InvalidResponseException($result['return_msg'], '0');
         }
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 30bbc25..8c3cdd2 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -70,7 +70,7 @@ class BasicWeChat
             $this->GetAccessTokenCallback = $options['GetAccessTokenCallback'];
         }
         if (!empty($options['cache_path'])) {
-            Tools::$cache_path = $options['cache_path'];
+            Tools::$CachePath = $options['cache_path'];
         }
         $this->config = new DataArray($options);
     }
diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 247bfe6..da4a24a 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -29,7 +29,7 @@ class Tools
      * 缓存路径
      * @var null
      */
-    public static $cache_path = null;
+    public static $CachePath = null;
 
 
     /**
@@ -75,10 +75,8 @@ class Tools
         if (empty($mines)) {
             $content = file_get_contents('http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
             preg_match_all('#^([^\s]{2,}?)\s+(.+?)$#ism', $content, $matches, PREG_SET_ORDER);
-            foreach ($matches as $match) {
-                foreach (explode(" ", $match[2]) as $ext) {
-                    $mines[$ext] = $match[1];
-                }
+            foreach ($matches as $match) foreach (explode(" ", $match[2]) as $ext) {
+                $mines[$ext] = $match[1];
             }
             self::setCache('all_ext_mine', $mines);
         }
@@ -256,20 +254,34 @@ class Tools
         return (intval($status["http_code"]) === 200) ? $content : false;
     }
 
+    /**
+     * 写入文件
+     * @param string $name 文件名称
+     * @param string $content 文件内容
+     * @return string
+     * @throws LocalCacheException
+     */
+    public static function pushFile($name, $content)
+    {
+        $file = self::getCacheName($name);
+        if (!file_put_contents($file, $content)) throw new LocalCacheException('local file write error.', '0');
+        return $file;
+    }
+
     /**
      * 缓存配置与存储
      * @param string $name 缓存名称
      * @param string $value 缓存内容
      * @param int $expired 缓存时间(0表示永久缓存)
+     * @return string
      * @throws LocalCacheException
      */
     public static function setCache($name, $value = '', $expired = 3600)
     {
-        $cache_file = self::getCacheName($name);
+        $file = self::getCacheName($name);
         $content = serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]);
-        if (!file_put_contents($cache_file, $content)) {
-            throw new LocalCacheException('local cache error.', '0');
-        }
+        if (!file_put_contents($file, $content)) throw new LocalCacheException('local cache error.', '0');
+        return $file;
     }
 
     /**
@@ -279,8 +291,8 @@ class Tools
      */
     public static function getCache($name)
     {
-        $cache_file = self::getCacheName($name);
-        if (file_exists($cache_file) && ($content = file_get_contents($cache_file))) {
+        $file = self::getCacheName($name);
+        if (file_exists($file) && ($content = file_get_contents($file))) {
             $data = unserialize($content);
             if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) {
                 return $data['value'];
@@ -297,8 +309,8 @@ class Tools
      */
     public static function delCache($name)
     {
-        $cache_file = self::getCacheName($name);
-        return file_exists($cache_file) ? unlink($cache_file) : true;
+        $file = self::getCacheName($name);
+        return file_exists($file) ? unlink($file) : true;
     }
 
     /**
@@ -308,11 +320,11 @@ class Tools
      */
     private static function getCacheName($name)
     {
-        if (empty(self::$cache_path)) {
-            self::$cache_path = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
+        if (empty(self::$CachePath)) {
+            self::$CachePath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
         }
-        self::$cache_path = rtrim(self::$cache_path, '/\\') . DIRECTORY_SEPARATOR;
-        file_exists(self::$cache_path) || mkdir(self::$cache_path, 0755, true);
-        return self::$cache_path . $name;
+        self::$CachePath = rtrim(self::$CachePath, '/\\') . DIRECTORY_SEPARATOR;
+        file_exists(self::$CachePath) || mkdir(self::$CachePath, 0755, true);
+        return self::$CachePath . $name;
     }
 }
\ No newline at end of file
diff --git a/WePay/TransfersBank.php b/WePay/TransfersBank.php
index f53aacb..5f57c82 100644
--- a/WePay/TransfersBank.php
+++ b/WePay/TransfersBank.php
@@ -53,7 +53,6 @@ class TransfersBank extends BasicPay
         if (!isset($options['amount'])) {
             throw new InvalidArgumentException('Missing Options -- [amount]');
         }
-        isset($options['desc']) && $this->params->set('desc', $options['desc']);
         $this->params->offsetUnset('appid');
         return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
             'amount'           => $options['amount'],
@@ -61,6 +60,7 @@ class TransfersBank extends BasicPay
             'partner_trade_no' => $options['partner_trade_no'],
             'enc_bank_no'      => $this->rsaEncode($options['enc_bank_no']),
             'enc_true_name'    => $this->rsaEncode($options['enc_true_name']),
+            'desc'             => isset($options['desc']) ? $options['desc'] : '',
         ], true, 'MD5', false);
     }
 
@@ -68,7 +68,8 @@ class TransfersBank extends BasicPay
      * 商户企业付款到银行卡操作进行结果查询
      * @param string $partnerTradeNo 商户订单号，需保持唯一
      * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function query($partnerTradeNo)
     {
diff --git a/composer.json b/composer.json
index 371dff3..5ed2a6e 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
   ],
   "require": {
     "php": ">=5.4",
+    "ext-json": "*",
     "ext-curl": "*",
     "ext-openssl": "*"
   },

From 7c9867ad7aec1963aca196110da9944001481c1b Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 23 Oct 2018 18:59:13 +0800
Subject: [PATCH 072/161] Update WeChat/Contracts/BasicPay.php

---
 WeChat/Contracts/BasicPay.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicPay.php
index 646cb6c..f9865ae 100644
--- a/WeChat/Contracts/BasicPay.php
+++ b/WeChat/Contracts/BasicPay.php
@@ -169,9 +169,7 @@ class BasicPay
         $params = $this->params->merge($data);
         $needSignType && ($params['sign_type'] = strtoupper($signType));
         $params['sign'] = $this->getPaySign($params, $signType);
-        print_r($params);
         $result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
-        print_r($result);
         if ($result['return_code'] !== 'SUCCESS') {
             throw new InvalidResponseException($result['return_msg'], '0');
         }

From 8cd19c0e19ada95428709aa35f58e2bd00340b47 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 24 Oct 2018 16:59:25 +0800
Subject: [PATCH 073/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E8=BF=98=E5=8E=9F?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=B7=AF=E5=BE=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicPay.php    |  2 +-
 WeChat/Contracts/BasicWeChat.php |  2 +-
 WeChat/Contracts/Tools.php       | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicPay.php
index f9865ae..263ede6 100644
--- a/WeChat/Contracts/BasicPay.php
+++ b/WeChat/Contracts/BasicPay.php
@@ -53,7 +53,7 @@ class BasicPay
             throw new InvalidArgumentException("Missing Config -- [mch_key]");
         }
         if (!empty($options['cache_path'])) {
-            Tools::$CachePath = $options['cache_path'];
+            Tools::$cache_path = $options['cache_path'];
         }
         $this->config = new DataArray($options);
         // 商户基础参数
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 8c3cdd2..30bbc25 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -70,7 +70,7 @@ class BasicWeChat
             $this->GetAccessTokenCallback = $options['GetAccessTokenCallback'];
         }
         if (!empty($options['cache_path'])) {
-            Tools::$CachePath = $options['cache_path'];
+            Tools::$cache_path = $options['cache_path'];
         }
         $this->config = new DataArray($options);
     }
diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index da4a24a..40e2371 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -29,7 +29,7 @@ class Tools
      * 缓存路径
      * @var null
      */
-    public static $CachePath = null;
+    public static $cache_path = null;
 
 
     /**
@@ -320,11 +320,11 @@ class Tools
      */
     private static function getCacheName($name)
     {
-        if (empty(self::$CachePath)) {
-            self::$CachePath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
+        if (empty(self::$cache_path)) {
+            self::$cache_path = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
         }
-        self::$CachePath = rtrim(self::$CachePath, '/\\') . DIRECTORY_SEPARATOR;
-        file_exists(self::$CachePath) || mkdir(self::$CachePath, 0755, true);
-        return self::$CachePath . $name;
+        self::$cache_path = rtrim(self::$cache_path, '/\\') . DIRECTORY_SEPARATOR;
+        file_exists(self::$cache_path) || mkdir(self::$cache_path, 0755, true);
+        return self::$cache_path . $name;
     }
 }
\ No newline at end of file

From 7438d3b7081ddbdb8320cf7762896d705710cf28 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 27 Oct 2018 15:50:34 +0800
Subject: [PATCH 074/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5=E7=AD=BE=E5=90=8D=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/BasicPay.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicPay.php
index 263ede6..eff91ac 100644
--- a/WeChat/Contracts/BasicPay.php
+++ b/WeChat/Contracts/BasicPay.php
@@ -95,9 +95,8 @@ class BasicPay
     public function getPaySign(array $data, $signType = 'MD5', $buff = '')
     {
         ksort($data);
-        foreach ($data as $k => $v) {
-            $buff .= "{$k}={$v}&";
-        }
+        if (isset($data['sign'])) unset($data['sign']);
+        foreach ($data as $k => $v) $buff .= "{$k}={$v}&";
         $buff .= ("key=" . $this->config->get('mch_key'));
         if (strtoupper($signType) === 'MD5') {
             return strtoupper(md5($buff));
@@ -109,7 +108,7 @@ class BasicPay
      * 转换短链接
      * @param string $longUrl 需要转换的URL，签名用原串，传输需URLencode
      * @return array
-     * @throws \WeChat\Exceptions\ExcInvalidResponseException
+     * @throws InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function shortUrl($longUrl)

From 81a18b8b3a5c88f5820249747e75035ac1b11d72 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 17:45:16 +0800
Subject: [PATCH 075/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9=20=E6=94=AF=E4=BB=98=E5=AE=9D=20=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/App.php              |  48 ++++++++
 AliPay/Bill.php             |  42 +++++++
 AliPay/Contracts/AliPay.php | 232 ++++++++++++++++++++++++++++++++++++
 AliPay/Pos.php              |  47 ++++++++
 AliPay/Scan.php             |  47 ++++++++
 AliPay/Transfer.php         |  47 ++++++++
 AliPay/Wap.php              |  48 ++++++++
 AliPay/Web.php              |  48 ++++++++
 Test/alipay-app.php         |  35 ++++++
 Test/alipay-bill.php        |  34 ++++++
 Test/alipay-notify.php      |  42 +++++++
 Test/alipay-pos.php         |  37 ++++++
 Test/alipay-refund.php      |  33 +++++
 Test/alipay-scan.php        |  35 ++++++
 Test/alipay-transfer.php    |  37 ++++++
 Test/alipay-wap.php         |  38 ++++++
 Test/alipay-web.php         |  38 ++++++
 Test/alipay.php             |  15 +++
 Test/config.php             |   6 +-
 WePay/Bill.php              |   3 +-
 WePay/Coupon.php            |   3 +
 WePay/Order.php             |   6 +
 WePay/Redpack.php           |   3 +
 WePay/Refund.php            |   6 +-
 WePay/Transfers.php         |   2 +
 include.php                 |  20 +---
 26 files changed, 932 insertions(+), 20 deletions(-)
 create mode 100644 AliPay/App.php
 create mode 100644 AliPay/Bill.php
 create mode 100644 AliPay/Contracts/AliPay.php
 create mode 100644 AliPay/Pos.php
 create mode 100644 AliPay/Scan.php
 create mode 100644 AliPay/Transfer.php
 create mode 100644 AliPay/Wap.php
 create mode 100644 AliPay/Web.php
 create mode 100644 Test/alipay-app.php
 create mode 100644 Test/alipay-bill.php
 create mode 100644 Test/alipay-notify.php
 create mode 100644 Test/alipay-pos.php
 create mode 100644 Test/alipay-refund.php
 create mode 100644 Test/alipay-scan.php
 create mode 100644 Test/alipay-transfer.php
 create mode 100644 Test/alipay-wap.php
 create mode 100644 Test/alipay-web.php
 create mode 100644 Test/alipay.php

diff --git a/AliPay/App.php b/AliPay/App.php
new file mode 100644
index 0000000..829ffe7
--- /dev/null
+++ b/AliPay/App.php
@@ -0,0 +1,48 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay;
+
+use AliPay\Contracts\AliPay;
+
+/**
+ * 支付宝App支付网关
+ * Class App
+ * @package AliPay
+ */
+class App extends AliPay
+{
+
+    /**
+     * App constructor.
+     * @param array $options
+     */
+    public function __construct(array $options)
+    {
+        parent::__construct($options);
+        $this->options->set('method', 'alipay.trade.app.pay');
+        $this->params->set('product_code', 'QUICK_MSECURITY_PAY');
+    }
+
+    /**
+     * 创建数据操作
+     * @param array $options
+     * @return string
+     */
+    public function apply($options)
+    {
+        $this->buildData($options);
+        return http_build_query($this->options->get());
+    }
+}
\ No newline at end of file
diff --git a/AliPay/Bill.php b/AliPay/Bill.php
new file mode 100644
index 0000000..1a95d3f
--- /dev/null
+++ b/AliPay/Bill.php
@@ -0,0 +1,42 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay;
+
+use AliPay\Contracts\AliPay;
+
+/**
+ * 支付宝电子面单下载
+ * Class Bill
+ * @package AliPay
+ */
+class Bill extends AliPay
+{
+    public function __construct(array $options)
+    {
+        parent::__construct($options);
+        $this->options->set('method', 'alipay.data.dataservice.bill.downloadurl.query');
+    }
+
+    /**
+     * 创建数据操作
+     * @param array $options
+     * @return mixed
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function apply($options)
+    {
+        return $this->getResult($options);
+    }
+}
\ No newline at end of file
diff --git a/AliPay/Contracts/AliPay.php b/AliPay/Contracts/AliPay.php
new file mode 100644
index 0000000..3961d16
--- /dev/null
+++ b/AliPay/Contracts/AliPay.php
@@ -0,0 +1,232 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay\Contracts;
+
+use WeChat\Contracts\DataArray;
+use WeChat\Contracts\Tools;
+use WeChat\Exceptions\InvalidArgumentException;
+
+/**
+ * 支付宝支付基类
+ * Class AliPay
+ * @package AliPay\Contracts
+ */
+abstract class AliPay
+{
+
+    /**
+     * 支持配置
+     * @var DataArray
+     */
+    protected $config;
+
+    /**
+     * 当前请求数据
+     * @var DataArray
+     */
+    protected $options;
+
+    /**
+     * DzContent数据
+     * @var DataArray
+     */
+    protected $params;
+
+    /**
+     * 正常请求网关
+     * @var string
+     */
+    protected $gateway = 'https://openapi.alipay.com/gateway.do?charset=utf-8';
+
+    /**
+     * AliPay constructor.
+     * @param array $options
+     */
+    public function __construct($options)
+    {
+        $this->params = new DataArray([]);
+        $this->config = new DataArray($options);
+        if (empty($options['appid'])) {
+            throw new InvalidArgumentException("Missing Config -- [appid]");
+        }
+        if (!empty($options['debug'])) {
+            $this->gateway = 'https://openapi.alipaydev.com/gateway.do?charset=utf-8';
+        }
+        $this->options = new DataArray([
+            'app_id'    => $this->config->get('appid'),
+            'charset'   => empty($options['charset']) ? 'utf-8' : $options['charset'],
+            'format'    => 'JSON',
+            'version'   => '1.0',
+            'sign_type' => 'RSA2',
+            'timestamp' => date('Y-m-d H:i:s'),
+        ]);
+        if (isset($options['notify_url']) && $options['notify_url'] !== '') {
+            $this->options->set('notify_url', $options['notify_url']);
+        }
+        if (isset($options['return_url']) && $options['return_url'] !== '') {
+            $this->options->set('return_url', $options['return_url']);
+        }
+        if (isset($options['app_auth_token']) && $options['app_auth_token'] !== '') {
+            $this->options->set('app_auth_token', $options['app_auth_token']);
+        }
+    }
+
+    /**
+     * 查询支付宝订单状态
+     * @param string $out_trade_no
+     * @return array|boolean
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function query($out_trade_no = '')
+    {
+        $this->options['method'] = 'alipay.trade.query';
+        return $this->getResult(['out_trade_no' => $out_trade_no]);
+    }
+
+    /**
+     * 支付宝订单退款操作
+     * @param array|string $options 退款参数或退款商户订单号
+     * @param null $refund_amount 退款金额
+     * @return array|boolean
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function refund($options, $refund_amount = null)
+    {
+        if (!is_array($options)) $options = ['out_trade_no' => $options, 'refund_amount' => $refund_amount];
+        $this->options['method'] = 'alipay.trade.refund';
+        return $this->getResult($options);
+    }
+
+    /**
+     * 关闭支付宝进行中的订单
+     * @param array|string $options
+     * @return array|boolean
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function close($options)
+    {
+        if (!is_array($options)) $options = ['out_trade_no' => $options];
+        $this->options['method'] = 'alipay.trade.close';
+        return $this->getResult($options);
+    }
+
+    /**
+     * 验证支付宝支付宝通知
+     * @param array $data 通知数据
+     * @param null $sign 数据签名
+     * @param boolean $sync
+     * @return array|bool
+     */
+    public function verify($data, $sign = null, $sync = false)
+    {
+        if (is_null($this->config->get('public_key'))) {
+            throw new InvalidArgumentException('Missing Config -- [public_key]');
+        }
+        $sign = is_null($sign) ? $data['sign'] : $sign;
+        $str = $sync ? json_encode($data) : $this->getSignContent($data, true);
+        $res = "-----BEGIN PUBLIC KEY-----\n" . wordwrap($this->config->get('public_key'), 64, "\n", true) . "\n-----END PUBLIC KEY-----";
+        return openssl_verify($str, base64_decode($sign), $res, OPENSSL_ALGO_SHA256) === 1 ? $data : false;
+    }
+
+    /**
+     * 获取数据签名
+     * @return string
+     */
+    protected function getSign()
+    {
+        if (is_null($this->config->get('private_key'))) {
+            throw new InvalidArgumentException('Missing Config -- [private_key]');
+        }
+        $res = "-----BEGIN RSA PRIVATE KEY-----\n" .
+            wordwrap($this->config->get('private_key'), 64, "\n", true) .
+            "\n-----END RSA PRIVATE KEY-----";
+        openssl_sign($this->getSignContent($this->options->get()), $sign, $res, OPENSSL_ALGO_SHA256);
+        return base64_encode($sign);
+    }
+
+    /**
+     * 数据签名处理
+     * @param array $data
+     * @param boolean $verify
+     * @param array $strs
+     * @return bool|string
+     */
+    private function getSignContent(array $data, $verify = false, $strs = [])
+    {
+        ksort($data);
+        foreach ($data as $k => $v) if ($v !== '') {
+            if ($verify && $k != 'sign' && $k != 'sign_type') array_push($strs, "{$k}={$v}");
+            if (!$verify && $v !== '' && !is_null($v) && $k != 'sign' && '@' != substr($v, 0, 1)) array_push($strs, "{$k}={$v}");
+        }
+        return join('&', $strs);
+    }
+
+    /**
+     * 数据包生成及数据签名
+     * @param array $options
+     */
+    protected function buildData($options)
+    {
+        $this->options['biz_content'] = json_encode($options, JSON_UNESCAPED_UNICODE);
+        $this->options['sign'] = $this->getSign();
+    }
+
+    /**
+     * 请求接口并验证访问数据
+     * @param array $options
+     * @return array|boolean
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    protected function getResult($options)
+    {
+        $this->buildData($options);
+        $data = json_decode(Tools::post($this->gateway, $this->options->get()), true);
+        $method = str_replace('.', '_', $this->options['method']) . '_response';
+        if (!isset($data[$method]['code']) || $data[$method]['code'] !== '10000') {
+            throw new \WeChat\Exceptions\InvalidResponseException(
+                "\nResultError" .
+                (empty($data[$method]['code']) ? '' : "\n{$data[$method]['msg']}[{$data[$method]['code']}]") .
+                (empty($data[$method]['sub_code']) ? '' : "\n{$data[$method]['sub_msg']}[{$data[$method]['sub_code']}]\n"),
+                $data[$method]['code'],
+                $data
+            );
+        }
+        return $this->verify($data[$method], $data['sign'], true);
+    }
+
+    /**
+     * 生成支付html代码
+     * @return string
+     */
+    protected function buildPayHtml()
+    {
+        $html = "<form id='alipaysubmit' name='alipaysubmit' action='{$this->gateway}' method='post'>";
+        foreach ($this->params->get() as $key => $value) {
+            $value = str_replace("'", '&apos;', $value);
+            $html .= "<input type='hidden' name='{$key}' value='{$value}'/>";
+        }
+        $html .= "<input type='submit' value='ok' style='display:none;'></form>";
+        return "{$html}<script>document.forms['alipaysubmit'].submit();</script>";
+    }
+
+    /**
+     * 应用数据操作
+     * @param array $options
+     * @return mixed
+     */
+    abstract public function apply($options);
+
+
+}
\ No newline at end of file
diff --git a/AliPay/Pos.php b/AliPay/Pos.php
new file mode 100644
index 0000000..a24ba31
--- /dev/null
+++ b/AliPay/Pos.php
@@ -0,0 +1,47 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay;
+
+use AliPay\Contracts\AliPay;
+
+/**
+ * 支付宝刷卡支付
+ * Class Pos
+ * @package AliPay
+ */
+class Pos extends AliPay
+{
+    /**
+     * Pos constructor.
+     * @param array $options
+     */
+    public function __construct(array $options)
+    {
+        parent::__construct($options);
+        $this->options->set('method', 'alipay.trade.pay');
+        $this->params->set('product_code', 'FACE_TO_FACE_PAYMENT');
+    }
+
+    /**
+     * 创建数据操作
+     * @param array $options
+     * @return mixed
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function apply($options)
+    {
+        return $this->getResult($options);
+    }
+}
\ No newline at end of file
diff --git a/AliPay/Scan.php b/AliPay/Scan.php
new file mode 100644
index 0000000..dc32a1d
--- /dev/null
+++ b/AliPay/Scan.php
@@ -0,0 +1,47 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay;
+
+use AliPay\Contracts\AliPay;
+
+/**
+ * 支付宝扫码支付
+ * Class Scan
+ * @package AliPay
+ */
+class Scan extends AliPay
+{
+
+    /**
+     * Scan constructor.
+     * @param array $options
+     */
+    public function __construct(array $options)
+    {
+        parent::__construct($options);
+        $this->options->set('method', 'alipay.trade.precreate');
+    }
+
+    /**
+     * 创建数据操作
+     * @param array $options
+     * @return mixed
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function apply($options)
+    {
+        return $this->getResult($options);
+    }
+}
\ No newline at end of file
diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
new file mode 100644
index 0000000..9aabc0c
--- /dev/null
+++ b/AliPay/Transfer.php
@@ -0,0 +1,47 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay;
+
+use AliPay\Contracts\AliPay;
+
+/**
+ * 支付宝转账
+ * Class Transfer
+ * @package AliPay
+ */
+class Transfer extends AliPay
+{
+
+    /**
+     * 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
+     * @return mixed
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function apply($options)
+    {
+        return $this->getResult($options);
+    }
+}
\ No newline at end of file
diff --git a/AliPay/Wap.php b/AliPay/Wap.php
new file mode 100644
index 0000000..941ddee
--- /dev/null
+++ b/AliPay/Wap.php
@@ -0,0 +1,48 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay;
+
+use AliPay\Contracts\AliPay;
+
+/**
+ * 手机WAP网站支付支持
+ * Class Wap
+ * @package AliPay
+ */
+class Wap extends AliPay
+{
+
+    /**
+     * Wap constructor.
+     * @param array $options
+     */
+    public function __construct(array $options)
+    {
+        parent::__construct($options);
+        $this->options->set('method', 'alipay.trade.wap.pay');
+        $this->params->set('product_code', 'QUICK_WAP_WAY');
+    }
+
+    /**
+     * 创建数据操作
+     * @param array $options
+     * @return string
+     */
+    public function apply($options)
+    {
+        parent::buildData($options);
+        return $this->buildPayHtml();
+    }
+}
\ No newline at end of file
diff --git a/AliPay/Web.php b/AliPay/Web.php
new file mode 100644
index 0000000..bb0a9c9
--- /dev/null
+++ b/AliPay/Web.php
@@ -0,0 +1,48 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace AliPay;
+
+use AliPay\Contracts\AliPay;
+
+/**
+ * 支付宝网站支付
+ * Class Web
+ * @package AliPay
+ */
+class Web extends AliPay
+{
+
+    /**
+     * Web constructor.
+     * @param array $options
+     */
+    public function __construct(array $options)
+    {
+        parent::__construct($options);
+        $this->options->set('method', 'alipay.trade.page.pay');
+        $this->params->set('product_code', 'FAST_INSTANT_TRADE_PAY');
+    }
+
+    /**
+     * 创建数据操作
+     * @param array $options
+     * @return string
+     */
+    public function apply($options)
+    {
+        parent::buildData($options);
+        return $this->buildPayHtml();
+    }
+}
\ No newline at end of file
diff --git a/Test/alipay-app.php b/Test/alipay-app.php
new file mode 100644
index 0000000..0098a59
--- /dev/null
+++ b/Test/alipay-app.php
@@ -0,0 +1,35 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+
+try {
+    // 实例支付对象
+    $pay = new \AliPay\App($config);
+    $result = $pay->apply([
+        'out_trade_no' => time(), // 商户订单号
+        'total_amount' => '1', // 支付金额
+        'subject'      => 'test subject', // 支付订单描述
+    ]);
+    echo '<pre>';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
+
diff --git a/Test/alipay-bill.php b/Test/alipay-bill.php
new file mode 100644
index 0000000..38a3a11
--- /dev/null
+++ b/Test/alipay-bill.php
@@ -0,0 +1,34 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+
+try {
+// 实例支付对象
+    $pay = new \AliPay\Bill($config);
+    $result = $pay->apply([
+        'bill_date' => '2017-11-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
+        'bill_type' => 'signcustomer', // 账单类型(trade指商户基于支付宝交易收单的业务账单,signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单)
+    ]);
+    echo '<pre>';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
+
diff --git a/Test/alipay-notify.php b/Test/alipay-notify.php
new file mode 100644
index 0000000..5c05406
--- /dev/null
+++ b/Test/alipay-notify.php
@@ -0,0 +1,42 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+
+// 实例支付对象
+$pay = new \Pay\Pay($config);
+
+if ($pay->driver('alipay')->gateway()->verify($_POST)) {
+    file_put_contents('notify.txt', "收到来自支付宝的异步通知\r\n", FILE_APPEND);
+    file_put_contents('notify.txt', '订单号：' . $_POST['out_trade_no'] . "\r\n", FILE_APPEND);
+    file_put_contents('notify.txt', '订单金额：' . $_POST['total_amount'] . "\r\n\r\n", FILE_APPEND);
+} else {
+    file_put_contents('notify.txt', "收到异步通知\r\n", FILE_APPEND);
+}
+
+
+// 下面是项目的真实代码
+/*
+$pay = new \Pay\Pay(config('pay'));
+$notifyInfo = $pay->driver('alipay')->gateway('app')->verify(request()->post('', '', null));
+p($notifyInfo, false, RUNTIME_PATH . date('Ymd') . '_notify.txt');
+if (in_array($notifyInfo['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
+    // 更新订单状态
+    $this->updateOrder($notifyInfo['out_trade_no'], $notifyInfo['trade_no'], $notifyInfo['receipt_amount'], 'alipay');
+}
+*/
\ No newline at end of file
diff --git a/Test/alipay-pos.php b/Test/alipay-pos.php
new file mode 100644
index 0000000..bd96b94
--- /dev/null
+++ b/Test/alipay-pos.php
@@ -0,0 +1,37 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+
+try {
+    // 实例支付对象
+    $pay = new \AliPay\Pos($config);
+    $result = $pay->apply([
+        'out_trade_no' => '4312412343', // 订单号
+        'total_amount' => '13', // 订单金额，单位：元
+        'subject'      => '订单商品标题', // 订单商品标题
+        'auth_code'    => '123456', // 授权码
+        'notify_url'   => 'http://localhost/notify.php', // 定义通知URL
+    ]);
+    echo '<pre>';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
+
diff --git a/Test/alipay-refund.php b/Test/alipay-refund.php
new file mode 100644
index 0000000..de03f9f
--- /dev/null
+++ b/Test/alipay-refund.php
@@ -0,0 +1,33 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+
+// 原商户订单号
+$out_trade_no = '56737188841424';
+// 申请退款金额
+$refund_fee = '1.00';
+
+try {
+    $pay = new \AliPay\App($config);
+    $result = $pay->refund($out_trade_no, $refund_fee);
+    echo '<pre>';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
\ No newline at end of file
diff --git a/Test/alipay-scan.php b/Test/alipay-scan.php
new file mode 100644
index 0000000..65bb3b8
--- /dev/null
+++ b/Test/alipay-scan.php
@@ -0,0 +1,35 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+
+try {
+    // 实例支付对象
+    $pay = new \AliPay\Scan($config);
+    $result = $pay->apply([
+        'out_trade_no' => '14321412', // 订单号
+        'total_amount' => '13', // 订单金额，单位：元
+        'subject'      => '订单商品标题', // 订单商品标题
+    ]);
+    echo '<pre>';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
+
diff --git a/Test/alipay-transfer.php b/Test/alipay-transfer.php
new file mode 100644
index 0000000..35a0ead
--- /dev/null
+++ b/Test/alipay-transfer.php
@@ -0,0 +1,37 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+
+try {
+    $pay = new \AliPay\Scan($config);
+    $result = $pay->apply([
+        'out_biz_no'      => '', // 订单号
+        'payee_type'      => 'ALIPAY_LOGONID', // 收款方账户类型(ALIPAY_LOGONID | ALIPAY_USERID)
+        'payee_account'   => 'demo@sandbox.com', // 收款方账户
+        'amount'          => '10', // 转账金额
+        'payer_show_name' => '未寒', // 付款方姓名
+        'payee_real_name' => '张三', // 收款方真实姓名
+        'remark'          => '张三', // 转账备注
+    ]);
+    echo '<pre>';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
diff --git a/Test/alipay-wap.php b/Test/alipay-wap.php
new file mode 100644
index 0000000..f2936b2
--- /dev/null
+++ b/Test/alipay-wap.php
@@ -0,0 +1,38 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+// 参考公共参数  https://docs.open.alipay.com/203/107090/
+$config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
+$config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
+
+try {
+// 实例支付对象
+    $pay = new \AliPay\Wap($config);
+    $result = $pay->apply([
+        'out_trade_no' => time(), // 商户订单号
+        'total_amount' => '1', // 支付金额
+        'subject'      => '支付订单描述', // 支付订单描述
+    ]);
+    echo '<pre>';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
+
diff --git a/Test/alipay-web.php b/Test/alipay-web.php
new file mode 100644
index 0000000..47312de
--- /dev/null
+++ b/Test/alipay-web.php
@@ -0,0 +1,38 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+// 1. 手动加载入口文件
+include "../include.php";
+
+// 2. 准备公众号配置参数
+$config = include "./alipay.php";
+
+// 参考公共参数  https://docs.open.alipay.com/203/107090/
+$config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
+$config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
+
+try {
+    $pay = new \AliPay\Web($config);
+    $result = $pay->apply([
+        'out_trade_no' => time(), // 商户订单号
+        'total_amount' => '1', // 支付金额
+        'subject'      => '支付订单描述', // 支付订单描述
+    ]);
+    echo '<pre>';
+    var_export($result);
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
+
diff --git a/Test/alipay.php b/Test/alipay.php
new file mode 100644
index 0000000..f4fe48a
--- /dev/null
+++ b/Test/alipay.php
@@ -0,0 +1,15 @@
+<?php
+// 沙箱模式
+return [
+    'debug'       => true,
+    // 应用ID
+    'appid'       => '2016090900468879',
+    // 支付宝公钥(1行填写)
+    '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=',
+    // 支付成功通知地址
+    'notify_url'  => '',
+    // 网页支付回跳地址
+    'return_url'  => '',
+];
\ No newline at end of file
diff --git a/Test/config.php b/Test/config.php
index 403f7ef..687b2dd 100644
--- a/Test/config.php
+++ b/Test/config.php
@@ -21,9 +21,9 @@ return [
     'mch_id'         => "1332187001",
     'mch_key'        => 'A82DC5BD1F3359081049C568D8502BC5',
     // 配置商户支付双向证书目录 （p12 | key,cert 二选一，两者都配置时p12优先）
-    // 'ssl_p12'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.p12',
-    'ssl_key'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_key.pem',
-    'ssl_cer'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.pem',
+    'ssl_p12'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . '1332187001_20181030_cert.p12',
+    // 'ssl_key'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . '1332187001_20181030_key.pem',
+    // 'ssl_cer'        => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . '1332187001_20181030_cert.pem',
     // 配置缓存目录，需要拥有写权限
     'cache_path'     => '',
 ];
\ No newline at end of file
diff --git a/WePay/Bill.php b/WePay/Bill.php
index e0767ae..3ad9459 100644
--- a/WePay/Bill.php
+++ b/WePay/Bill.php
@@ -51,7 +51,8 @@ class Bill extends BasicPay
      * 拉取订单评价数据
      * @param array $options
      * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function comment(array $options)
     {
diff --git a/WePay/Coupon.php b/WePay/Coupon.php
index 3281048..28a0f3a 100644
--- a/WePay/Coupon.php
+++ b/WePay/Coupon.php
@@ -28,6 +28,7 @@ class Coupon extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function create(array $options)
     {
@@ -40,6 +41,7 @@ class Coupon extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function queryStock(array $options)
     {
@@ -52,6 +54,7 @@ class Coupon extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function queryInfo(array $options)
     {
diff --git a/WePay/Order.php b/WePay/Order.php
index bed6af6..06a158b 100644
--- a/WePay/Order.php
+++ b/WePay/Order.php
@@ -30,6 +30,7 @@ class Order extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function create(array $options)
     {
@@ -42,6 +43,7 @@ class Order extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function query(array $options)
     {
@@ -54,6 +56,7 @@ class Order extends BasicPay
      * @param string $outTradeNo 商户订单号
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function close($outTradeNo)
     {
@@ -102,6 +105,7 @@ class Order extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function reverse(array $options)
     {
@@ -114,6 +118,7 @@ class Order extends BasicPay
      * @param string $authCode 扫码支付授权码，设备读取用户微信中的条码或者二维码信息
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function queryAuthCode($authCode)
     {
@@ -126,6 +131,7 @@ class Order extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function report(array $options)
     {
diff --git a/WePay/Redpack.php b/WePay/Redpack.php
index 4da8975..3f0fc3e 100644
--- a/WePay/Redpack.php
+++ b/WePay/Redpack.php
@@ -29,6 +29,7 @@ class Redpack extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function create(array $options)
     {
@@ -43,6 +44,7 @@ class Redpack extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function groups(array $options)
     {
@@ -57,6 +59,7 @@ class Redpack extends BasicPay
      * @param string $mchBillno 商户发放红包的商户订单号
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function query($mchBillno)
     {
diff --git a/WePay/Refund.php b/WePay/Refund.php
index da81522..ba98d18 100644
--- a/WePay/Refund.php
+++ b/WePay/Refund.php
@@ -30,7 +30,8 @@ class Refund extends BasicPay
      * 创建退款订单
      * @param array $options
      * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function create(array $options)
     {
@@ -42,7 +43,8 @@ class Refund extends BasicPay
      * 查询退款
      * @param array $options
      * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function query(array $options)
     {
diff --git a/WePay/Transfers.php b/WePay/Transfers.php
index f86d147..130dce4 100644
--- a/WePay/Transfers.php
+++ b/WePay/Transfers.php
@@ -29,6 +29,7 @@ class Transfers extends BasicPay
      * @param array $options
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function create(array $options)
     {
@@ -45,6 +46,7 @@ class Transfers extends BasicPay
      * @param string $partnerTradeNo 商户调用企业付款API时使用的商户订单号
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function query($partnerTradeNo)
     {
diff --git a/include.php b/include.php
index 49dc9f8..0b1e02b 100644
--- a/include.php
+++ b/include.php
@@ -13,20 +13,12 @@
 // +----------------------------------------------------------------------
 
 spl_autoload_register(function ($classname) {
-    $separator = DIRECTORY_SEPARATOR;
-    $filename = __DIR__ . $separator . str_replace('\\', $separator, $classname) . '.php';
+    $filename = __DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
     if (file_exists($filename)) {
-        if (stripos($classname, 'WeChat') === 0) {
-            include $filename;
-        }
-        if (stripos($classname, 'WeMini') === 0) {
-            include $filename;
-        }
-        if (stripos($classname, 'WePay') === 0) {
-            include $filename;
-        }
-        if ($classname === 'We') {
-            include $filename;
-        }
+        if (stripos($classname, 'WeChat') === 0) include $filename;
+        elseif (stripos($classname, 'WeMini') === 0) include $filename;
+        elseif (stripos($classname, 'WePay') === 0) include $filename;
+        elseif (stripos($classname, 'AliPay') === 0) include $filename;
+        elseif ($classname === 'We') include $filename;
     }
 });
\ No newline at end of file

From 9dba6a72a6c5add186a2f4e115020ec4f8cbb182 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 17:51:26 +0800
Subject: [PATCH 076/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/Bill.php        |  4 ++++
 Test/alipay-app.php    |  1 +
 Test/alipay-bill.php   |  3 ++-
 Test/alipay-notify.php | 20 +++++++-------------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/AliPay/Bill.php b/AliPay/Bill.php
index 1a95d3f..0b656c1 100644
--- a/AliPay/Bill.php
+++ b/AliPay/Bill.php
@@ -23,6 +23,10 @@ use AliPay\Contracts\AliPay;
  */
 class Bill extends AliPay
 {
+    /**
+     * Bill constructor.
+     * @param array $options
+     */
     public function __construct(array $options)
     {
         parent::__construct($options);
diff --git a/Test/alipay-app.php b/Test/alipay-app.php
index 0098a59..e36e0f2 100644
--- a/Test/alipay-app.php
+++ b/Test/alipay-app.php
@@ -21,6 +21,7 @@ $config = include "./alipay.php";
 try {
     // 实例支付对象
     $pay = new \AliPay\App($config);
+    // 请参考（请求参数）：https://docs.open.alipay.com/api_1/alipay.trade.app.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
         'total_amount' => '1', // 支付金额
diff --git a/Test/alipay-bill.php b/Test/alipay-bill.php
index 38a3a11..42f7615 100644
--- a/Test/alipay-bill.php
+++ b/Test/alipay-bill.php
@@ -19,8 +19,9 @@ include "../include.php";
 $config = include "./alipay.php";
 
 try {
-// 实例支付对象
+    // 实例支付对象
     $pay = new \AliPay\Bill($config);
+    // 请参考（请求参数）：https://docs.open.alipay.com/api_15/alipay.data.dataservice.bill.downloadurl.query
     $result = $pay->apply([
         'bill_date' => '2017-11-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
         'bill_type' => 'signcustomer', // 账单类型(trade指商户基于支付宝交易收单的业务账单,signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单)
diff --git a/Test/alipay-notify.php b/Test/alipay-notify.php
index 5c05406..8824f60 100644
--- a/Test/alipay-notify.php
+++ b/Test/alipay-notify.php
@@ -19,9 +19,8 @@ include "../include.php";
 $config = include "./alipay.php";
 
 // 实例支付对象
-$pay = new \Pay\Pay($config);
-
-if ($pay->driver('alipay')->gateway()->verify($_POST)) {
+$pay = new \AliPay\App($config);
+if ($pay->verify($_POST)) {
     file_put_contents('notify.txt', "收到来自支付宝的异步通知\r\n", FILE_APPEND);
     file_put_contents('notify.txt', '订单号：' . $_POST['out_trade_no'] . "\r\n", FILE_APPEND);
     file_put_contents('notify.txt', '订单金额：' . $_POST['total_amount'] . "\r\n\r\n", FILE_APPEND);
@@ -29,14 +28,9 @@ if ($pay->driver('alipay')->gateway()->verify($_POST)) {
     file_put_contents('notify.txt', "收到异步通知\r\n", FILE_APPEND);
 }
 
-
-// 下面是项目的真实代码
-/*
-$pay = new \Pay\Pay(config('pay'));
-$notifyInfo = $pay->driver('alipay')->gateway('app')->verify(request()->post('', '', null));
-p($notifyInfo, false, RUNTIME_PATH . date('Ymd') . '_notify.txt');
-if (in_array($notifyInfo['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
-    // 更新订单状态
-    $this->updateOrder($notifyInfo['out_trade_no'], $notifyInfo['trade_no'], $notifyInfo['receipt_amount'], 'alipay');
+// 下面是支付通知处理
+$pay = new \AliPay\App($config);
+$notify = $pay->verify($_POST);
+if (in_array($notify['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
+    // @todo 更新订单状态，支付完成
 }
-*/
\ No newline at end of file

From 1505a043ba7b39fad930dc21d7b6cbbff89b9fc3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 17:57:58 +0800
Subject: [PATCH 077/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/alipay-pos.php      | 2 +-
 Test/alipay-refund.php   | 2 ++
 Test/alipay-scan.php     | 1 +
 Test/alipay-transfer.php | 2 ++
 Test/alipay-wap.php      | 3 ++-
 Test/alipay-web.php      | 2 ++
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Test/alipay-pos.php b/Test/alipay-pos.php
index bd96b94..509e72f 100644
--- a/Test/alipay-pos.php
+++ b/Test/alipay-pos.php
@@ -21,12 +21,12 @@ $config = include "./alipay.php";
 try {
     // 实例支付对象
     $pay = new \AliPay\Pos($config);
+    // 参数链接：https://docs.open.alipay.com/api_1/alipay.trade.pay
     $result = $pay->apply([
         'out_trade_no' => '4312412343', // 订单号
         'total_amount' => '13', // 订单金额，单位：元
         'subject'      => '订单商品标题', // 订单商品标题
         'auth_code'    => '123456', // 授权码
-        'notify_url'   => 'http://localhost/notify.php', // 定义通知URL
     ]);
     echo '<pre>';
     var_export($result);
diff --git a/Test/alipay-refund.php b/Test/alipay-refund.php
index de03f9f..22579ef 100644
--- a/Test/alipay-refund.php
+++ b/Test/alipay-refund.php
@@ -24,7 +24,9 @@ $out_trade_no = '56737188841424';
 $refund_fee = '1.00';
 
 try {
+    // 实例支付对象
     $pay = new \AliPay\App($config);
+    // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.refund
     $result = $pay->refund($out_trade_no, $refund_fee);
     echo '<pre>';
     var_export($result);
diff --git a/Test/alipay-scan.php b/Test/alipay-scan.php
index 65bb3b8..4157b33 100644
--- a/Test/alipay-scan.php
+++ b/Test/alipay-scan.php
@@ -21,6 +21,7 @@ $config = include "./alipay.php";
 try {
     // 实例支付对象
     $pay = new \AliPay\Scan($config);
+    // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.precreate
     $result = $pay->apply([
         'out_trade_no' => '14321412', // 订单号
         'total_amount' => '13', // 订单金额，单位：元
diff --git a/Test/alipay-transfer.php b/Test/alipay-transfer.php
index 35a0ead..21a3d8b 100644
--- a/Test/alipay-transfer.php
+++ b/Test/alipay-transfer.php
@@ -19,7 +19,9 @@ include "../include.php";
 $config = include "./alipay.php";
 
 try {
+    // 实例支付对象
     $pay = new \AliPay\Scan($config);
+    // 参考链接：https://docs.open.alipay.com/api_28/alipay.fund.trans.toaccount.transfer
     $result = $pay->apply([
         'out_biz_no'      => '', // 订单号
         'payee_type'      => 'ALIPAY_LOGONID', // 收款方账户类型(ALIPAY_LOGONID | ALIPAY_USERID)
diff --git a/Test/alipay-wap.php b/Test/alipay-wap.php
index f2936b2..ba8f616 100644
--- a/Test/alipay-wap.php
+++ b/Test/alipay-wap.php
@@ -22,8 +22,9 @@ $config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
 $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
 
 try {
-// 实例支付对象
+    // 实例支付对象
     $pay = new \AliPay\Wap($config);
+    // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.wap.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
         'total_amount' => '1', // 支付金额
diff --git a/Test/alipay-web.php b/Test/alipay-web.php
index 47312de..dd52fe7 100644
--- a/Test/alipay-web.php
+++ b/Test/alipay-web.php
@@ -23,7 +23,9 @@ $config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
 $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
 
 try {
+    // 实例支付对象
     $pay = new \AliPay\Web($config);
+    // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.page.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
         'total_amount' => '1', // 支付金额

From faa9b8d0f17630dabe56a068a578b4eb0fe9b4d8 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:06:47 +0800
Subject: [PATCH 078/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=8A=A0=E8=BD=BD=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/Transfer.php      |  2 +-
 Test/alipay-app.php      |  3 ++-
 Test/alipay-bill.php     |  3 ++-
 Test/alipay-notify.php   |  3 ++-
 Test/alipay-pos.php      |  3 ++-
 Test/alipay-refund.php   |  3 ++-
 Test/alipay-scan.php     |  3 ++-
 Test/alipay-transfer.php |  3 ++-
 Test/alipay-wap.php      |  3 ++-
 Test/alipay-web.php      |  3 ++-
 We.php                   | 11 +++++++++++
 11 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
index 9aabc0c..1db65ee 100644
--- a/AliPay/Transfer.php
+++ b/AliPay/Transfer.php
@@ -17,7 +17,7 @@ namespace AliPay;
 use AliPay\Contracts\AliPay;
 
 /**
- * 支付宝转账
+ * 支付宝转账到账户
  * Class Transfer
  * @package AliPay
  */
diff --git a/Test/alipay-app.php b/Test/alipay-app.php
index e36e0f2..a905328 100644
--- a/Test/alipay-app.php
+++ b/Test/alipay-app.php
@@ -20,7 +20,8 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = new \AliPay\App($config);
+    $pay = \We::AliPayApp($config);
+    // $pay = new \AliPay\App($config);
     // 请参考（请求参数）：https://docs.open.alipay.com/api_1/alipay.trade.app.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
diff --git a/Test/alipay-bill.php b/Test/alipay-bill.php
index 42f7615..bade9d4 100644
--- a/Test/alipay-bill.php
+++ b/Test/alipay-bill.php
@@ -20,7 +20,8 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = new \AliPay\Bill($config);
+    $pay = \We::AliPayBill($config);
+    // $pay = new \AliPay\Bill($config);
     // 请参考（请求参数）：https://docs.open.alipay.com/api_15/alipay.data.dataservice.bill.downloadurl.query
     $result = $pay->apply([
         'bill_date' => '2017-11-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
diff --git a/Test/alipay-notify.php b/Test/alipay-notify.php
index 8824f60..9e9b84b 100644
--- a/Test/alipay-notify.php
+++ b/Test/alipay-notify.php
@@ -19,7 +19,8 @@ include "../include.php";
 $config = include "./alipay.php";
 
 // 实例支付对象
-$pay = new \AliPay\App($config);
+$pay = \We::AliPayApp($config);
+// $pay = new \AliPay\App($config);
 if ($pay->verify($_POST)) {
     file_put_contents('notify.txt', "收到来自支付宝的异步通知\r\n", FILE_APPEND);
     file_put_contents('notify.txt', '订单号：' . $_POST['out_trade_no'] . "\r\n", FILE_APPEND);
diff --git a/Test/alipay-pos.php b/Test/alipay-pos.php
index 509e72f..4900374 100644
--- a/Test/alipay-pos.php
+++ b/Test/alipay-pos.php
@@ -20,7 +20,8 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = new \AliPay\Pos($config);
+    $pay = We::AliPayPos($config);
+    // $pay = new \AliPay\Pos($config);
     // 参数链接：https://docs.open.alipay.com/api_1/alipay.trade.pay
     $result = $pay->apply([
         'out_trade_no' => '4312412343', // 订单号
diff --git a/Test/alipay-refund.php b/Test/alipay-refund.php
index 22579ef..57fb0bf 100644
--- a/Test/alipay-refund.php
+++ b/Test/alipay-refund.php
@@ -25,7 +25,8 @@ $refund_fee = '1.00';
 
 try {
     // 实例支付对象
-    $pay = new \AliPay\App($config);
+    $pay = We::AliPayApp($config);
+    // $pay = new \AliPay\App($config);
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.refund
     $result = $pay->refund($out_trade_no, $refund_fee);
     echo '<pre>';
diff --git a/Test/alipay-scan.php b/Test/alipay-scan.php
index 4157b33..0a11076 100644
--- a/Test/alipay-scan.php
+++ b/Test/alipay-scan.php
@@ -20,7 +20,8 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = new \AliPay\Scan($config);
+    $pay = We::AliPayScan($config);
+    // $pay = new \AliPay\Scan($config);
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.precreate
     $result = $pay->apply([
         'out_trade_no' => '14321412', // 订单号
diff --git a/Test/alipay-transfer.php b/Test/alipay-transfer.php
index 21a3d8b..54ba8ac 100644
--- a/Test/alipay-transfer.php
+++ b/Test/alipay-transfer.php
@@ -20,7 +20,8 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = new \AliPay\Scan($config);
+    $pay = We::AliPayTransfer($config);
+    // $pay = new \AliPay\Scan($config);
     // 参考链接：https://docs.open.alipay.com/api_28/alipay.fund.trans.toaccount.transfer
     $result = $pay->apply([
         'out_biz_no'      => '', // 订单号
diff --git a/Test/alipay-wap.php b/Test/alipay-wap.php
index ba8f616..8a0aab3 100644
--- a/Test/alipay-wap.php
+++ b/Test/alipay-wap.php
@@ -23,7 +23,8 @@ $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
 
 try {
     // 实例支付对象
-    $pay = new \AliPay\Wap($config);
+    $pay = We::AliPayWap($config);
+    // $pay = new \AliPay\Wap($config);
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.wap.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
diff --git a/Test/alipay-web.php b/Test/alipay-web.php
index dd52fe7..2225f11 100644
--- a/Test/alipay-web.php
+++ b/Test/alipay-web.php
@@ -24,7 +24,8 @@ $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
 
 try {
     // 实例支付对象
-    $pay = new \AliPay\Web($config);
+    $pay = We::AliPayWeb($config);
+    // $pay = new \AliPay\Web($config);
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.page.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
diff --git a/We.php b/We.php
index f8891d9..74e2b6b 100644
--- a/We.php
+++ b/We.php
@@ -58,6 +58,15 @@ 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
 {
@@ -104,6 +113,8 @@ class We
             $class = 'WeMini\\' . substr($name, 6);
         } elseif (substr($name, 0, 5) === 'WePay') {
             $class = 'WePay\\' . substr($name, 5);
+        } elseif (substr($name, 0, 6) === 'AliPay') {
+            $class = 'AliPay\\' . substr($name, 6);
         }
         if (!empty($class) && class_exists($class)) {
             $option = array_shift($arguments);

From 92746c60384ef08c13c85b708e93aa1970d2b4c8 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:08:00 +0800
Subject: [PATCH 079/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=9F=BA=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/App.php                           | 4 ++--
 AliPay/Bill.php                          | 4 ++--
 AliPay/Contracts/{AliPay.php => Ali.php} | 2 +-
 AliPay/Pos.php                           | 4 ++--
 AliPay/Scan.php                          | 4 ++--
 AliPay/Transfer.php                      | 4 ++--
 AliPay/Wap.php                           | 4 ++--
 AliPay/Web.php                           | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)
 rename AliPay/Contracts/{AliPay.php => Ali.php} (99%)

diff --git a/AliPay/App.php b/AliPay/App.php
index 829ffe7..c93a30d 100644
--- a/AliPay/App.php
+++ b/AliPay/App.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\AliPay;
+use AliPay\Contracts\Ali;
 
 /**
  * 支付宝App支付网关
  * Class App
  * @package AliPay
  */
-class App extends AliPay
+class App extends Ali
 {
 
     /**
diff --git a/AliPay/Bill.php b/AliPay/Bill.php
index 0b656c1..46e762d 100644
--- a/AliPay/Bill.php
+++ b/AliPay/Bill.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\AliPay;
+use AliPay\Contracts\Ali;
 
 /**
  * 支付宝电子面单下载
  * Class Bill
  * @package AliPay
  */
-class Bill extends AliPay
+class Bill extends Ali
 {
     /**
      * Bill constructor.
diff --git a/AliPay/Contracts/AliPay.php b/AliPay/Contracts/Ali.php
similarity index 99%
rename from AliPay/Contracts/AliPay.php
rename to AliPay/Contracts/Ali.php
index 3961d16..7c0ef7f 100644
--- a/AliPay/Contracts/AliPay.php
+++ b/AliPay/Contracts/Ali.php
@@ -23,7 +23,7 @@ use WeChat\Exceptions\InvalidArgumentException;
  * Class AliPay
  * @package AliPay\Contracts
  */
-abstract class AliPay
+abstract class Ali
 {
 
     /**
diff --git a/AliPay/Pos.php b/AliPay/Pos.php
index a24ba31..9f040ee 100644
--- a/AliPay/Pos.php
+++ b/AliPay/Pos.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\AliPay;
+use AliPay\Contracts\Ali;
 
 /**
  * 支付宝刷卡支付
  * Class Pos
  * @package AliPay
  */
-class Pos extends AliPay
+class Pos extends Ali
 {
     /**
      * Pos constructor.
diff --git a/AliPay/Scan.php b/AliPay/Scan.php
index dc32a1d..27c6b20 100644
--- a/AliPay/Scan.php
+++ b/AliPay/Scan.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\AliPay;
+use AliPay\Contracts\Ali;
 
 /**
  * 支付宝扫码支付
  * Class Scan
  * @package AliPay
  */
-class Scan extends AliPay
+class Scan extends Ali
 {
 
     /**
diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
index 1db65ee..45183d7 100644
--- a/AliPay/Transfer.php
+++ b/AliPay/Transfer.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\AliPay;
+use AliPay\Contracts\Ali;
 
 /**
  * 支付宝转账到账户
  * Class Transfer
  * @package AliPay
  */
-class Transfer extends AliPay
+class Transfer extends Ali
 {
 
     /**
diff --git a/AliPay/Wap.php b/AliPay/Wap.php
index 941ddee..7f7f33e 100644
--- a/AliPay/Wap.php
+++ b/AliPay/Wap.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\AliPay;
+use AliPay\Contracts\Ali;
 
 /**
  * 手机WAP网站支付支持
  * Class Wap
  * @package AliPay
  */
-class Wap extends AliPay
+class Wap extends Ali
 {
 
     /**
diff --git a/AliPay/Web.php b/AliPay/Web.php
index bb0a9c9..6f2a56a 100644
--- a/AliPay/Web.php
+++ b/AliPay/Web.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\AliPay;
+use AliPay\Contracts\Ali;
 
 /**
  * 支付宝网站支付
  * Class Web
  * @package AliPay
  */
-class Web extends AliPay
+class Web extends Ali
 {
 
     /**

From 5b78438c36ed1d406c0553ea499cb4b9ce1c8277 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:18:20 +0800
Subject: [PATCH 080/161] Update README.md

---
 README.md | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b3816a7..63a69a7 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,14 @@ WeChatDeveloper for PHP
 * 我们鼓励大家使用 composer 来管理您的第三方库，方便后期更新操作；
 * WeChatDeveloper 已历经数个线上项目考验，欢迎 fork 或 star 此项目。
 
+支持范围
+--
+* 微信小程序
+* 微信认证服务号
+* 微信商户（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付）
+* 支付宝（账单、转账、App支付、刷卡支付、扫码支付、Web支付、Wap支付）
 
-Documentation
+技术帮助
 --
 PHP开发技术交流（QQ群 513350915）
 
@@ -28,18 +34,24 @@ WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先
 * 开发文档地址：https://www.kancloud.cn/zoujingli/wechat-developer
 
 
-Repositorie
+代码仓库
 --
 WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。
 * Gitee 托管地址：https://gitee.com/zoujingli/WeChatDeveloper
 * GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
 
-ClassMap
+文件说明
 --
 
-
 |文件名|类名|描述|类型|加载 ①|
 |---|---|---|---|---|
+|  App.php  |  AliPay\App  |  支付宝App支付  |  支付宝  |  \We::AliPayApp() |
+|  Bill.php  |  AliPay\Bill  |  支付宝账单下载  |  支付宝  |  \We::AliPayBill() |
+|  Pos.php  |  AliPay\Pos  |  支付宝刷卡支付  |  支付宝  |  \We::AliPayPos() |
+|  Scan.php  |  AliPay\Scan  |  支付宝扫码支付  |  支付宝  |  \We::AliPayScan() |
+|  Transfer.php  |  AliPay\Transfer  |  支付宝转账  |  支付宝  |  \We::AliPayTransfer() |
+|  Wap.php  |  AliPay\Wap  |  支付宝Wap支付  |  支付宝  |  \We::AliPayWap() |
+|  Web.php  |  AliPay\Web  |  支付宝Web支付  |  支付宝  |  \We::AliPayWeb() |
 |  Card.php  |  WeChat\Card  |  微信卡券接口支持  |  认证服务号  |  \We::WeChatCard() |
 |  Custom.php  | WeChat\Custom   |  微信客服消息接口支持   |  认证服务号 | \We::WeChatCustom() |
 |  Media.php  | WeChat\Media   |  微信媒体素材接口支持  |  认证服务号 | \We::WeChatMedia() |

From 21c5b4e3f811417e4e495f846ab8841938a2cb1b Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:19:12 +0800
Subject: [PATCH 081/161] Update README.md

---
 README.md | 37 +++----------------------------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 63a69a7..3c18c88 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
 |  Total.php  | WeMini\Total   |  微信小程序数据接口  | 微信小程序 | \We::WeMiniTotal() |
 
 
-Install
+安装使用
 --
 1.1 通过 Composer 来管理安装
 ```shell
@@ -142,44 +142,13 @@ try {
 }
 ```
 
-Encapsulation
---
-* 接入验证 （初级权限）
-* 自动回复（文本、图片、语音、视频、音乐、图文） （初级权限）
-* 菜单操作（查询、创建、删除） （菜单权限）
-* 客服消息（文本、图片、语音、视频、音乐、图文） （认证权限）
-* 二维码（创建临时、永久二维码，获取二维码URL） （服务号、认证权限）
-* 长链接转短链接接口 （服务号、认证权限）
-* 标签操作（查询、创建、修改、移动用户到标签） （认证权限）
-* 网页授权（基本授权，用户信息授权） （服务号、认证权限）
-* 用户信息（查询用户基本信息、获取关注者列表） （认证权限）
-* 多客服功能（客服管理、获取客服记录、客服会话管理） （认证权限）
-* 媒体文件（上传、获取） （认证权限）
-* 高级群发 （认证权限）
-* 模板消息（设置所属行业、添加模板、发送模板消息） （服务号、认证权限）
-* 卡券管理（创建、修改、删除、发放、门店管理等） （认证权限）
-* 语义理解 （服务号、认证权限）
-* 获取微信服务器IP列表 （初级权限）
-* 微信JSAPI授权(获取ticket、获取签名) （初级权限）
-* 数据统计(用户、图文、消息、接口分析数据) （认证权限）
-* 微信支付（网页支付、扫码支付、交易退款、给粉丝打款）（认证服务号并开通支付功能）
-
-
-Permission
---
-* 初级权限：基本权限，任何正常的公众号都有此权限
-* 菜单权限：正常的服务号、认证后的订阅号拥有此权限
-* 认证权限：分为订阅号、服务号认证，如前缀服务号则仅认证的服务号有此权限
-* 支付权限：仅认证后的服务号可以申请此权限
-
-
-Copyright
+版权说明
 --
 * WeChatDeveloper 基于`MIT`协议发布，任何人可以用在任何地方，不受约束
 * WeChatDeveloper 部分代码来自互联网，若有异议，可以联系作者进行删除
 
 
-Sponsor
+赞助支持
 --
 ![赞助](http://zoujingli.oschina.io/static/pay.png)
 

From 777d6c839665e531a2d83583c7d8dc2ac440540a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:19:39 +0800
Subject: [PATCH 082/161] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3c18c88..c38d752 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ WeChatDeveloper for PHP
 --
 * 微信小程序
 * 微信认证服务号
-* 微信商户（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付）
-* 支付宝（账单、转账、App支付、刷卡支付、扫码支付、Web支付、Wap支付）
+* 微信支付（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付）
+* 支付宝支付（账单、转账、App支付、刷卡支付、扫码支付、Web支付、Wap支付）
 
 技术帮助
 --

From d609751466b3d543b86128950a863a5b25cde88a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:20:31 +0800
Subject: [PATCH 083/161] Update README.md

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c38d752..33d5acc 100644
--- a/README.md
+++ b/README.md
@@ -13,14 +13,14 @@ WeChatDeveloper for PHP
 * WeChatDeveloper 已历经数个线上项目考验，欢迎 fork 或 star 此项目。
 
 支持范围
---
+---
 * 微信小程序
 * 微信认证服务号
 * 微信支付（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付）
 * 支付宝支付（账单、转账、App支付、刷卡支付、扫码支付、Web支付、Wap支付）
 
 技术帮助
---
+---
 PHP开发技术交流（QQ群 513350915）
 
 [![PHP微信开发群 (SDK)](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a) 
@@ -35,13 +35,13 @@ WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先
 
 
 代码仓库
---
+---
 WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。
 * Gitee 托管地址：https://gitee.com/zoujingli/WeChatDeveloper
 * GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
 
 文件说明
---
+---
 
 |文件名|类名|描述|类型|加载 ①|
 |---|---|---|---|---|
@@ -83,7 +83,7 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
 
 
 安装使用
---
+---
 1.1 通过 Composer 来管理安装
 ```shell
 # 首次安装 线上版本（稳定）
@@ -143,13 +143,13 @@ try {
 ```
 
 版权说明
---
+---
 * WeChatDeveloper 基于`MIT`协议发布，任何人可以用在任何地方，不受约束
 * WeChatDeveloper 部分代码来自互联网，若有异议，可以联系作者进行删除
 
 
 赞助支持
---
+---
 ![赞助](http://zoujingli.oschina.io/static/pay.png)
 
 

From 594645b7c8d9ef761f0dfa5b8d5c9c56bb5aca12 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:21:21 +0800
Subject: [PATCH 084/161] Update README.md

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

diff --git a/README.md b/README.md
index 33d5acc..5a08c5c 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ try {
 }
 ```
 
-版权说明
+关于开源
 ---
 * WeChatDeveloper 基于`MIT`协议发布，任何人可以用在任何地方，不受约束
 * WeChatDeveloper 部分代码来自互联网，若有异议，可以联系作者进行删除

From 749926df57da09478e91d76d85897010f5bbf1ff Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:22:49 +0800
Subject: [PATCH 085/161] Update README.md

---
 README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 5a08c5c..db34d72 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![License](https://poser.pugx.org/zoujingli/wechat-developer/license)](https://packagist.org/packages/zoujingli/wechat-developer)
 
 WeChatDeveloper for PHP
---
+----
 * WeChatDeveloper 是基于 [wechat-php-sdk](https://github.com/zoujingli/wechat-php-sdk) 重构，优化并完善；
 * 运行最底要求 PHP 版本 5.4 , 建议在 PHP7 上运行以获取最佳性能；
 * WeChatDeveloper 针对 access_token 失效增加了自动刷新机制；
@@ -13,14 +13,14 @@ WeChatDeveloper for PHP
 * WeChatDeveloper 已历经数个线上项目考验，欢迎 fork 或 star 此项目。
 
 支持范围
----
+----
 * 微信小程序
 * 微信认证服务号
 * 微信支付（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付）
 * 支付宝支付（账单、转账、App支付、刷卡支付、扫码支付、Web支付、Wap支付）
 
 技术帮助
----
+----
 PHP开发技术交流（QQ群 513350915）
 
 [![PHP微信开发群 (SDK)](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a) 
@@ -31,17 +31,17 @@ WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先
 
 针对 WeChatDeveloper 也有一准备了帮助资料可供参考。
 * ThinkAdmin：https://github.com/zoujingli/Think.Admin
-* 开发文档地址：https://www.kancloud.cn/zoujingli/wechat-developer
+* WeChatDeveloper：https://www.kancloud.cn/zoujingli/wechat-developer
 
 
 代码仓库
----
+----
 WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。
 * Gitee 托管地址：https://gitee.com/zoujingli/WeChatDeveloper
 * GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
 
 文件说明
----
+----
 
 |文件名|类名|描述|类型|加载 ①|
 |---|---|---|---|---|
@@ -83,7 +83,7 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
 
 
 安装使用
----
+----
 1.1 通过 Composer 来管理安装
 ```shell
 # 首次安装 线上版本（稳定）
@@ -142,14 +142,14 @@ try {
 }
 ```
 
-关于开源
----
+赞助支持
+----
+![赞助](http://zoujingli.oschina.io/static/pay.png)
+
+开源协议
+----
 * WeChatDeveloper 基于`MIT`协议发布，任何人可以用在任何地方，不受约束
 * WeChatDeveloper 部分代码来自互联网，若有异议，可以联系作者进行删除
 
 
-赞助支持
----
-![赞助](http://zoujingli.oschina.io/static/pay.png)
-
 

From 0af4f5a909556d0a45b36bda4a87a7b3c9784471 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:23:53 +0800
Subject: [PATCH 086/161] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index db34d72..cce28df 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ WeChatDeveloper for PHP
 
 支持范围
 ----
-* 微信小程序
-* 微信认证服务号
+* 微信小程序，支持服务端接口
+* 微信认证服务号，支持服务端接口
 * 微信支付（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付）
 * 支付宝支付（账单、转账、App支付、刷卡支付、扫码支付、Web支付、Wap支付）
 

From 631a7f5468a8806421b48ff2abc08c9c9acb37e4 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:25:23 +0800
Subject: [PATCH 087/161] Update README.md

---
 README.md | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index cce28df..a808709 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ WeChatDeveloper for PHP
 * 我们鼓励大家使用 composer 来管理您的第三方库，方便后期更新操作；
 * WeChatDeveloper 已历经数个线上项目考验，欢迎 fork 或 star 此项目。
 
-支持范围
+功能描述
 ----
-* 微信小程序，支持服务端接口
-* 微信认证服务号，支持服务端接口
-* 微信支付（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付）
-* 支付宝支付（账单、转账、App支付、刷卡支付、扫码支付、Web支付、Wap支付）
+* 微信小程序，服务端接口支持
+* 微信认证服务号，服务端接口支持
+* 微信支付（账单、卡券、红包、退款、转账、App支付、JSAPI支付、Web支付、扫码支付等）
+* 支付宝支付（账单、转账、App支付、刷卡支付、扫码支付、Web支付、Wap支付等）
 
 技术帮助
 ----
@@ -142,14 +142,13 @@ try {
 }
 ```
 
-赞助支持
-----
-![赞助](http://zoujingli.oschina.io/static/pay.png)
-
 开源协议
 ----
 * WeChatDeveloper 基于`MIT`协议发布，任何人可以用在任何地方，不受约束
 * WeChatDeveloper 部分代码来自互联网，若有异议，可以联系作者进行删除
 
+赞助支持
+----
+![赞助](http://zoujingli.oschina.io/static/pay.png)
 
 

From 3747468813d85ce6b8f18ff53387b20b0b307b06 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:33:43 +0800
Subject: [PATCH 088/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {Test => _test}/alipay-app.php               | 0
 {Test => _test}/alipay-bill.php              | 0
 {Test => _test}/alipay-notify.php            | 0
 {Test => _test}/alipay-pos.php               | 0
 {Test => _test}/alipay-refund.php            | 0
 {Test => _test}/alipay-scan.php              | 0
 {Test => _test}/alipay-transfer.php          | 0
 {Test => _test}/alipay-wap.php               | 0
 {Test => _test}/alipay-web.php               | 0
 {Test => _test}/alipay.php                   | 0
 {Test => _test}/config.php                   | 0
 {Test => _test}/mini-login.php               | 0
 {Test => _test}/mini-qrc.php                 | 0
 {Test => _test}/pay-download-bill.php        | 0
 {Test => _test}/pay-order-close.php          | 0
 {Test => _test}/pay-order-create.php         | 0
 {Test => _test}/pay-order-query.php          | 0
 {Test => _test}/pay-refund-create.php        | 0
 {Test => _test}/pay-refund-query.php         | 0
 {Test => _test}/pay-transfers-create.php     | 0
 {Test => _test}/pay-transfersbank-create.php | 0
 {Test => _test}/wechat-jssdk-sign.php        | 0
 {Test => _test}/wechat-menu-get.php          | 0
 {Test => _test}/wechat-qrcode-create.php     | 0
 {Test => _test}/wechat-user-get.php          | 0
 25 files changed, 0 insertions(+), 0 deletions(-)
 rename {Test => _test}/alipay-app.php (100%)
 rename {Test => _test}/alipay-bill.php (100%)
 rename {Test => _test}/alipay-notify.php (100%)
 rename {Test => _test}/alipay-pos.php (100%)
 rename {Test => _test}/alipay-refund.php (100%)
 rename {Test => _test}/alipay-scan.php (100%)
 rename {Test => _test}/alipay-transfer.php (100%)
 rename {Test => _test}/alipay-wap.php (100%)
 rename {Test => _test}/alipay-web.php (100%)
 rename {Test => _test}/alipay.php (100%)
 rename {Test => _test}/config.php (100%)
 rename {Test => _test}/mini-login.php (100%)
 rename {Test => _test}/mini-qrc.php (100%)
 rename {Test => _test}/pay-download-bill.php (100%)
 rename {Test => _test}/pay-order-close.php (100%)
 rename {Test => _test}/pay-order-create.php (100%)
 rename {Test => _test}/pay-order-query.php (100%)
 rename {Test => _test}/pay-refund-create.php (100%)
 rename {Test => _test}/pay-refund-query.php (100%)
 rename {Test => _test}/pay-transfers-create.php (100%)
 rename {Test => _test}/pay-transfersbank-create.php (100%)
 rename {Test => _test}/wechat-jssdk-sign.php (100%)
 rename {Test => _test}/wechat-menu-get.php (100%)
 rename {Test => _test}/wechat-qrcode-create.php (100%)
 rename {Test => _test}/wechat-user-get.php (100%)

diff --git a/Test/alipay-app.php b/_test/alipay-app.php
similarity index 100%
rename from Test/alipay-app.php
rename to _test/alipay-app.php
diff --git a/Test/alipay-bill.php b/_test/alipay-bill.php
similarity index 100%
rename from Test/alipay-bill.php
rename to _test/alipay-bill.php
diff --git a/Test/alipay-notify.php b/_test/alipay-notify.php
similarity index 100%
rename from Test/alipay-notify.php
rename to _test/alipay-notify.php
diff --git a/Test/alipay-pos.php b/_test/alipay-pos.php
similarity index 100%
rename from Test/alipay-pos.php
rename to _test/alipay-pos.php
diff --git a/Test/alipay-refund.php b/_test/alipay-refund.php
similarity index 100%
rename from Test/alipay-refund.php
rename to _test/alipay-refund.php
diff --git a/Test/alipay-scan.php b/_test/alipay-scan.php
similarity index 100%
rename from Test/alipay-scan.php
rename to _test/alipay-scan.php
diff --git a/Test/alipay-transfer.php b/_test/alipay-transfer.php
similarity index 100%
rename from Test/alipay-transfer.php
rename to _test/alipay-transfer.php
diff --git a/Test/alipay-wap.php b/_test/alipay-wap.php
similarity index 100%
rename from Test/alipay-wap.php
rename to _test/alipay-wap.php
diff --git a/Test/alipay-web.php b/_test/alipay-web.php
similarity index 100%
rename from Test/alipay-web.php
rename to _test/alipay-web.php
diff --git a/Test/alipay.php b/_test/alipay.php
similarity index 100%
rename from Test/alipay.php
rename to _test/alipay.php
diff --git a/Test/config.php b/_test/config.php
similarity index 100%
rename from Test/config.php
rename to _test/config.php
diff --git a/Test/mini-login.php b/_test/mini-login.php
similarity index 100%
rename from Test/mini-login.php
rename to _test/mini-login.php
diff --git a/Test/mini-qrc.php b/_test/mini-qrc.php
similarity index 100%
rename from Test/mini-qrc.php
rename to _test/mini-qrc.php
diff --git a/Test/pay-download-bill.php b/_test/pay-download-bill.php
similarity index 100%
rename from Test/pay-download-bill.php
rename to _test/pay-download-bill.php
diff --git a/Test/pay-order-close.php b/_test/pay-order-close.php
similarity index 100%
rename from Test/pay-order-close.php
rename to _test/pay-order-close.php
diff --git a/Test/pay-order-create.php b/_test/pay-order-create.php
similarity index 100%
rename from Test/pay-order-create.php
rename to _test/pay-order-create.php
diff --git a/Test/pay-order-query.php b/_test/pay-order-query.php
similarity index 100%
rename from Test/pay-order-query.php
rename to _test/pay-order-query.php
diff --git a/Test/pay-refund-create.php b/_test/pay-refund-create.php
similarity index 100%
rename from Test/pay-refund-create.php
rename to _test/pay-refund-create.php
diff --git a/Test/pay-refund-query.php b/_test/pay-refund-query.php
similarity index 100%
rename from Test/pay-refund-query.php
rename to _test/pay-refund-query.php
diff --git a/Test/pay-transfers-create.php b/_test/pay-transfers-create.php
similarity index 100%
rename from Test/pay-transfers-create.php
rename to _test/pay-transfers-create.php
diff --git a/Test/pay-transfersbank-create.php b/_test/pay-transfersbank-create.php
similarity index 100%
rename from Test/pay-transfersbank-create.php
rename to _test/pay-transfersbank-create.php
diff --git a/Test/wechat-jssdk-sign.php b/_test/wechat-jssdk-sign.php
similarity index 100%
rename from Test/wechat-jssdk-sign.php
rename to _test/wechat-jssdk-sign.php
diff --git a/Test/wechat-menu-get.php b/_test/wechat-menu-get.php
similarity index 100%
rename from Test/wechat-menu-get.php
rename to _test/wechat-menu-get.php
diff --git a/Test/wechat-qrcode-create.php b/_test/wechat-qrcode-create.php
similarity index 100%
rename from Test/wechat-qrcode-create.php
rename to _test/wechat-qrcode-create.php
diff --git a/Test/wechat-user-get.php b/_test/wechat-user-get.php
similarity index 100%
rename from Test/wechat-user-get.php
rename to _test/wechat-user-get.php

From fcb2cdbb086da34ef2e09fbcbbf9b48fa033624c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:42:47 +0800
Subject: [PATCH 089/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/App.php                                             | 4 ++--
 AliPay/Bill.php                                            | 4 ++--
 AliPay/Pos.php                                             | 4 ++--
 AliPay/Scan.php                                            | 5 +++--
 AliPay/Transfer.php                                        | 5 +++--
 AliPay/Wap.php                                             | 4 ++--
 AliPay/Web.php                                             | 4 ++--
 We.php                                                     | 2 +-
 .../Contracts/Ali.php => WeChat/Contracts/BasicAliPay.php  | 7 ++-----
 WeChat/Contracts/{BasicPay.php => BasicWePay.php}          | 2 +-
 WeChat/{Pay.php => WePay.php}                              | 4 ++--
 WePay/Bill.php                                             | 4 ++--
 WePay/Coupon.php                                           | 4 ++--
 WePay/Order.php                                            | 4 ++--
 WePay/Redpack.php                                          | 4 ++--
 WePay/Refund.php                                           | 4 ++--
 WePay/Transfers.php                                        | 4 ++--
 WePay/TransfersBank.php                                    | 4 ++--
 _test/pay-download-bill.php                                | 2 +-
 _test/pay-order-close.php                                  | 2 +-
 _test/pay-order-create.php                                 | 2 +-
 _test/pay-order-query.php                                  | 2 +-
 _test/pay-refund-create.php                                | 2 +-
 _test/pay-refund-query.php                                 | 2 +-
 _test/pay-transfers-create.php                             | 2 +-
 _test/pay-transfersbank-create.php                         | 2 +-
 26 files changed, 44 insertions(+), 45 deletions(-)
 rename AliPay/Contracts/Ali.php => WeChat/Contracts/BasicAliPay.php (98%)
 rename WeChat/Contracts/{BasicPay.php => BasicWePay.php} (99%)
 rename WeChat/{Pay.php => WePay.php} (98%)

diff --git a/AliPay/App.php b/AliPay/App.php
index c93a30d..37f10da 100644
--- a/AliPay/App.php
+++ b/AliPay/App.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\Ali;
+use WeChat\Contracts\BasicAliPay;
 
 /**
  * 支付宝App支付网关
  * Class App
  * @package AliPay
  */
-class App extends Ali
+class App extends BasicAliPay
 {
 
     /**
diff --git a/AliPay/Bill.php b/AliPay/Bill.php
index 46e762d..4717197 100644
--- a/AliPay/Bill.php
+++ b/AliPay/Bill.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\Ali;
+use WeChat\Contracts\BasicAliPay;
 
 /**
  * 支付宝电子面单下载
  * Class Bill
  * @package AliPay
  */
-class Bill extends Ali
+class Bill extends BasicAliPay
 {
     /**
      * Bill constructor.
diff --git a/AliPay/Pos.php b/AliPay/Pos.php
index 9f040ee..b173082 100644
--- a/AliPay/Pos.php
+++ b/AliPay/Pos.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\Ali;
+use WeChat\Contracts\BasicAliPay;
 
 /**
  * 支付宝刷卡支付
  * Class Pos
  * @package AliPay
  */
-class Pos extends Ali
+class Pos extends BasicAliPay
 {
     /**
      * Pos constructor.
diff --git a/AliPay/Scan.php b/AliPay/Scan.php
index 27c6b20..d3d0672 100644
--- a/AliPay/Scan.php
+++ b/AliPay/Scan.php
@@ -14,14 +14,15 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\Ali;
+
+use WeChat\Contracts\BasicAliPay;
 
 /**
  * 支付宝扫码支付
  * Class Scan
  * @package AliPay
  */
-class Scan extends Ali
+class Scan extends BasicAliPay
 {
 
     /**
diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
index 45183d7..3e51f17 100644
--- a/AliPay/Transfer.php
+++ b/AliPay/Transfer.php
@@ -14,14 +14,15 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\Ali;
+
+use WeChat\Contracts\BasicAliPay;
 
 /**
  * 支付宝转账到账户
  * Class Transfer
  * @package AliPay
  */
-class Transfer extends Ali
+class Transfer extends BasicAliPay
 {
 
     /**
diff --git a/AliPay/Wap.php b/AliPay/Wap.php
index 7f7f33e..e1bef83 100644
--- a/AliPay/Wap.php
+++ b/AliPay/Wap.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\Ali;
+use WeChat\Contracts\BasicAliPay;
 
 /**
  * 手机WAP网站支付支持
  * Class Wap
  * @package AliPay
  */
-class Wap extends Ali
+class Wap extends BasicAliPay
 {
 
     /**
diff --git a/AliPay/Web.php b/AliPay/Web.php
index 6f2a56a..6f58f2d 100644
--- a/AliPay/Web.php
+++ b/AliPay/Web.php
@@ -14,14 +14,14 @@
 
 namespace AliPay;
 
-use AliPay\Contracts\Ali;
+use WeChat\Contracts\BasicAliPay;
 
 /**
  * 支付宝网站支付
  * Class Web
  * @package AliPay
  */
-class Web extends Ali
+class Web extends BasicAliPay
 {
 
     /**
diff --git a/We.php b/We.php
index 74e2b6b..3845137 100644
--- a/We.php
+++ b/We.php
@@ -30,7 +30,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WeChat\Media WeChatMedia($options = []) static 微信素材管理
  * @method \WeChat\Menu WeChatMenu($options = []) static 微信菜单管理
  * @method \WeChat\Oauth WeChatOauth($options = []) static 微信网页授权
- * @method \WeChat\Pay WeChatPay($options = []) static 微信支付商户
+ * @method \WeChat\WePay WeChatPay($options = []) static 微信支付商户
  * @method \WeChat\Product WeChatProduct($options = []) static 微信商店管理
  * @method \WeChat\Qrcode WeChatQrcode($options = []) static 微信二维码管理
  * @method \WeChat\Receive WeChatReceive($options = []) static 微信推送管理
diff --git a/AliPay/Contracts/Ali.php b/WeChat/Contracts/BasicAliPay.php
similarity index 98%
rename from AliPay/Contracts/Ali.php
rename to WeChat/Contracts/BasicAliPay.php
index 7c0ef7f..c067474 100644
--- a/AliPay/Contracts/Ali.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -12,10 +12,8 @@
 // | github开源项目：https://github.com/zoujingli/WeChatDeveloper
 // +----------------------------------------------------------------------
 
-namespace AliPay\Contracts;
+namespace WeChat\Contracts;
 
-use WeChat\Contracts\DataArray;
-use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidArgumentException;
 
 /**
@@ -23,7 +21,7 @@ use WeChat\Exceptions\InvalidArgumentException;
  * Class AliPay
  * @package AliPay\Contracts
  */
-abstract class Ali
+abstract class BasicAliPay
 {
 
     /**
@@ -228,5 +226,4 @@ abstract class Ali
      */
     abstract public function apply($options);
 
-
 }
\ No newline at end of file
diff --git a/WeChat/Contracts/BasicPay.php b/WeChat/Contracts/BasicWePay.php
similarity index 99%
rename from WeChat/Contracts/BasicPay.php
rename to WeChat/Contracts/BasicWePay.php
index eff91ac..f25cbda 100644
--- a/WeChat/Contracts/BasicPay.php
+++ b/WeChat/Contracts/BasicWePay.php
@@ -22,7 +22,7 @@ use WeChat\Exceptions\InvalidResponseException;
  * Class BasicPay
  * @package WeChat\Contracts
  */
-class BasicPay
+class BasicWePay
 {
     /**
      * 商户配置
diff --git a/WeChat/Pay.php b/WeChat/WePay.php
similarity index 98%
rename from WeChat/Pay.php
rename to WeChat/WePay.php
index de595d9..1820de5 100644
--- a/WeChat/Pay.php
+++ b/WeChat/WePay.php
@@ -14,7 +14,7 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\BasicWePay;
 use WeChat\Exceptions\InvalidResponseException;
 use WePay\Bill;
 use WePay\Order;
@@ -27,7 +27,7 @@ use WePay\TransfersBank;
  * Class Pay
  * @package WeChat\Contracts
  */
-class Pay extends BasicPay
+class WePay extends BasicWePay
 {
 
     /**
diff --git a/WePay/Bill.php b/WePay/Bill.php
index 3ad9459..383da63 100644
--- a/WePay/Bill.php
+++ b/WePay/Bill.php
@@ -14,7 +14,7 @@
 
 namespace WePay;
 
-use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\BasicWePay;
 use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidResponseException;
 
@@ -23,7 +23,7 @@ use WeChat\Exceptions\InvalidResponseException;
  * Class Bill
  * @package WePay
  */
-class Bill extends BasicPay
+class Bill extends BasicWePay
 {
     /**
      * 下载对账单
diff --git a/WePay/Coupon.php b/WePay/Coupon.php
index 28a0f3a..92ca5c0 100644
--- a/WePay/Coupon.php
+++ b/WePay/Coupon.php
@@ -14,14 +14,14 @@
 
 namespace WePay;
 
-use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\BasicWePay;
 
 /**
  * 微信商户代金券
  * Class Coupon
  * @package WePay
  */
-class Coupon extends BasicPay
+class Coupon extends BasicWePay
 {
     /**
      * 发放代金券
diff --git a/WePay/Order.php b/WePay/Order.php
index 06a158b..1b9de10 100644
--- a/WePay/Order.php
+++ b/WePay/Order.php
@@ -14,7 +14,7 @@
 
 namespace WePay;
 
-use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\BasicWePay;
 use WeChat\Contracts\Tools;
 
 /**
@@ -22,7 +22,7 @@ use WeChat\Contracts\Tools;
  * Class Order
  * @package WePay
  */
-class Order extends BasicPay
+class Order extends BasicWePay
 {
 
     /**
diff --git a/WePay/Redpack.php b/WePay/Redpack.php
index 3f0fc3e..bf97ad8 100644
--- a/WePay/Redpack.php
+++ b/WePay/Redpack.php
@@ -14,14 +14,14 @@
 
 namespace WePay;
 
-use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\BasicWePay;
 
 /**
  * 微信红包支持
  * Class Redpack
  * @package WePay
  */
-class Redpack extends BasicPay
+class Redpack extends BasicWePay
 {
 
     /**
diff --git a/WePay/Refund.php b/WePay/Refund.php
index ba98d18..8e3c199 100644
--- a/WePay/Refund.php
+++ b/WePay/Refund.php
@@ -14,7 +14,7 @@
 
 namespace WePay;
 
-use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\BasicWePay;
 use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidResponseException;
 
@@ -23,7 +23,7 @@ use WeChat\Exceptions\InvalidResponseException;
  * Class Refund
  * @package WePay
  */
-class Refund extends BasicPay
+class Refund extends BasicWePay
 {
 
     /**
diff --git a/WePay/Transfers.php b/WePay/Transfers.php
index 130dce4..89ff1d8 100644
--- a/WePay/Transfers.php
+++ b/WePay/Transfers.php
@@ -14,14 +14,14 @@
 
 namespace WePay;
 
-use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\BasicWePay;
 
 /**
  * 微信商户打款到零钱
  * Class Transfers
  * @package WePay
  */
-class Transfers extends BasicPay
+class Transfers extends BasicWePay
 {
 
     /**
diff --git a/WePay/TransfersBank.php b/WePay/TransfersBank.php
index 5f57c82..0509d01 100644
--- a/WePay/TransfersBank.php
+++ b/WePay/TransfersBank.php
@@ -14,7 +14,7 @@
 
 namespace WePay;
 
-use WeChat\Contracts\BasicPay;
+use WeChat\Contracts\BasicWePay;
 use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidArgumentException;
 use WeChat\Exceptions\InvalidDecryptException;
@@ -25,7 +25,7 @@ use WeChat\Exceptions\InvalidResponseException;
  * Class TransfersBank
  * @package WePay
  */
-class TransfersBank extends BasicPay
+class TransfersBank extends BasicWePay
 {
 
     /**
diff --git a/_test/pay-download-bill.php b/_test/pay-download-bill.php
index c0181fb..3bcf9a8 100644
--- a/_test/pay-download-bill.php
+++ b/_test/pay-download-bill.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    $wechat = new \WeChat\WePay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-order-close.php b/_test/pay-order-close.php
index 3a31ddc..a70cae5 100644
--- a/_test/pay-order-close.php
+++ b/_test/pay-order-close.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    $wechat = new \WeChat\WePay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = '1217752501201407033233368018';
diff --git a/_test/pay-order-create.php b/_test/pay-order-create.php
index e130bb1..21dfea8 100644
--- a/_test/pay-order-create.php
+++ b/_test/pay-order-create.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    $wechat = new \WeChat\WePay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-order-query.php b/_test/pay-order-query.php
index d993488..7e7151c 100644
--- a/_test/pay-order-query.php
+++ b/_test/pay-order-query.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    $wechat = new \WeChat\WePay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-refund-create.php b/_test/pay-refund-create.php
index 02b554b..8447f06 100644
--- a/_test/pay-refund-create.php
+++ b/_test/pay-refund-create.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    $wechat = new \WeChat\WePay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-refund-query.php b/_test/pay-refund-query.php
index a812ac4..7383b89 100644
--- a/_test/pay-refund-query.php
+++ b/_test/pay-refund-query.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    $wechat = new \WeChat\WePay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-transfers-create.php b/_test/pay-transfers-create.php
index 77d70b0..889bd19 100644
--- a/_test/pay-transfers-create.php
+++ b/_test/pay-transfers-create.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    $wechat = new \WeChat\WePay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-transfersbank-create.php b/_test/pay-transfersbank-create.php
index 92147af..f70d12d 100644
--- a/_test/pay-transfersbank-create.php
+++ b/_test/pay-transfersbank-create.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    $wechat = new \WeChat\WePay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [

From bfa43d1506c7c6febb718ed2cee802934dc2e8f9 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:43:56 +0800
Subject: [PATCH 090/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/Scan.php     | 2 --
 AliPay/Transfer.php | 1 -
 AliPay/Wap.php      | 1 -
 AliPay/Web.php      | 1 -
 4 files changed, 5 deletions(-)

diff --git a/AliPay/Scan.php b/AliPay/Scan.php
index d3d0672..b86afc1 100644
--- a/AliPay/Scan.php
+++ b/AliPay/Scan.php
@@ -14,7 +14,6 @@
 
 namespace AliPay;
 
-
 use WeChat\Contracts\BasicAliPay;
 
 /**
@@ -24,7 +23,6 @@ use WeChat\Contracts\BasicAliPay;
  */
 class Scan extends BasicAliPay
 {
-
     /**
      * Scan constructor.
      * @param array $options
diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
index 3e51f17..001eaca 100644
--- a/AliPay/Transfer.php
+++ b/AliPay/Transfer.php
@@ -14,7 +14,6 @@
 
 namespace AliPay;
 
-
 use WeChat\Contracts\BasicAliPay;
 
 /**
diff --git a/AliPay/Wap.php b/AliPay/Wap.php
index e1bef83..cdd3faf 100644
--- a/AliPay/Wap.php
+++ b/AliPay/Wap.php
@@ -23,7 +23,6 @@ use WeChat\Contracts\BasicAliPay;
  */
 class Wap extends BasicAliPay
 {
-
     /**
      * Wap constructor.
      * @param array $options
diff --git a/AliPay/Web.php b/AliPay/Web.php
index 6f58f2d..cca9720 100644
--- a/AliPay/Web.php
+++ b/AliPay/Web.php
@@ -23,7 +23,6 @@ use WeChat\Contracts\BasicAliPay;
  */
 class Web extends BasicAliPay
 {
-
     /**
      * Web constructor.
      * @param array $options

From 210a75b346f7109797ee5404a2ba8bb7a6559809 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:50:23 +0800
Subject: [PATCH 091/161] Update WeChat/Contracts/BasicAliPay.php

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

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index c067474..bf47d4c 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -133,9 +133,10 @@ abstract class BasicAliPay
             throw new InvalidArgumentException('Missing Config -- [public_key]');
         }
         $sign = is_null($sign) ? $data['sign'] : $sign;
-        $str = $sync ? json_encode($data) : $this->getSignContent($data, true);
-        $res = "-----BEGIN PUBLIC KEY-----\n" . wordwrap($this->config->get('public_key'), 64, "\n", true) . "\n-----END PUBLIC KEY-----";
-        return openssl_verify($str, base64_decode($sign), $res, OPENSSL_ALGO_SHA256) === 1 ? $data : false;
+        $content = wordwrap($this->config->get('public_key'), 64, "\n", true);
+        $string = $sync ? json_encode($data) : $this->getSignContent($data, true);
+        $res = "-----BEGIN PUBLIC KEY-----\n{$content}\n-----END PUBLIC KEY-----";
+        return openssl_verify($string, base64_decode($sign), $res, OPENSSL_ALGO_SHA256) === 1 ? $data : false;
     }
 
     /**

From 0c1e64f22037ed8996656c54baec5f7b7e58bf58 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:51:08 +0800
Subject: [PATCH 092/161] Update WeChat/Contracts/BasicAliPay.php

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

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index bf47d4c..a549bae 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -148,10 +148,9 @@ abstract class BasicAliPay
         if (is_null($this->config->get('private_key'))) {
             throw new InvalidArgumentException('Missing Config -- [private_key]');
         }
-        $res = "-----BEGIN RSA PRIVATE KEY-----\n" .
-            wordwrap($this->config->get('private_key'), 64, "\n", true) .
-            "\n-----END RSA PRIVATE KEY-----";
-        openssl_sign($this->getSignContent($this->options->get()), $sign, $res, OPENSSL_ALGO_SHA256);
+        $content = wordwrap($this->config->get('private_key'), 64, "\n", true);
+        $string = "-----BEGIN RSA PRIVATE KEY-----\n{$content}\n-----END RSA PRIVATE KEY-----";
+        openssl_sign($this->getSignContent($this->options->get()), $sign, $string, OPENSSL_ALGO_SHA256);
         return base64_encode($sign);
     }
 

From 83eba868bee15080b43692c4fd7270a0621fdf95 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:54:09 +0800
Subject: [PATCH 093/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/App.php                   | 2 +-
 AliPay/Wap.php                   | 2 +-
 AliPay/Web.php                   | 2 +-
 WeChat/Contracts/BasicAliPay.php | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AliPay/App.php b/AliPay/App.php
index 37f10da..f2cf383 100644
--- a/AliPay/App.php
+++ b/AliPay/App.php
@@ -42,7 +42,7 @@ class App extends BasicAliPay
      */
     public function apply($options)
     {
-        $this->buildData($options);
+        $this->applyData($options);
         return http_build_query($this->options->get());
     }
 }
\ No newline at end of file
diff --git a/AliPay/Wap.php b/AliPay/Wap.php
index cdd3faf..e97ac94 100644
--- a/AliPay/Wap.php
+++ b/AliPay/Wap.php
@@ -41,7 +41,7 @@ class Wap extends BasicAliPay
      */
     public function apply($options)
     {
-        parent::buildData($options);
+        parent::applyData($options);
         return $this->buildPayHtml();
     }
 }
\ No newline at end of file
diff --git a/AliPay/Web.php b/AliPay/Web.php
index cca9720..2ad937c 100644
--- a/AliPay/Web.php
+++ b/AliPay/Web.php
@@ -41,7 +41,7 @@ class Web extends BasicAliPay
      */
     public function apply($options)
     {
-        parent::buildData($options);
+        parent::applyData($options);
         return $this->buildPayHtml();
     }
 }
\ No newline at end of file
diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index a549bae..f3b2e62 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -175,7 +175,7 @@ abstract class BasicAliPay
      * 数据包生成及数据签名
      * @param array $options
      */
-    protected function buildData($options)
+    protected function applyData($options)
     {
         $this->options['biz_content'] = json_encode($options, JSON_UNESCAPED_UNICODE);
         $this->options['sign'] = $this->getSign();
@@ -189,7 +189,7 @@ abstract class BasicAliPay
      */
     protected function getResult($options)
     {
-        $this->buildData($options);
+        $this->applyData($options);
         $data = json_decode(Tools::post($this->gateway, $this->options->get()), true);
         $method = str_replace('.', '_', $this->options['method']) . '_response';
         if (!isset($data[$method]['code']) || $data[$method]['code'] !== '10000') {

From ef02366345111d8a9569607d21892b00d1fcad2b Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 18:57:17 +0800
Subject: [PATCH 094/161] Update WeChat/Contracts/BasicAliPay.php

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

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index f3b2e62..826446e 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -59,6 +59,12 @@ abstract class BasicAliPay
         if (empty($options['appid'])) {
             throw new InvalidArgumentException("Missing Config -- [appid]");
         }
+        if (empty($options['public_key'])) {
+            throw new InvalidArgumentException("Missing Config -- [public_key]");
+        }
+        if (empty($options['private_key'])) {
+            throw new InvalidArgumentException("Missing Config -- [private_key]");
+        }
         if (!empty($options['debug'])) {
             $this->gateway = 'https://openapi.alipaydev.com/gateway.do?charset=utf-8';
         }

From 4f02179b048ed2aef121b733f166323f2cd1083c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 19:05:39 +0800
Subject: [PATCH 095/161] Update include.php

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

diff --git a/include.php b/include.php
index 0b1e02b..8cf8d6d 100644
--- a/include.php
+++ b/include.php
@@ -17,8 +17,8 @@ spl_autoload_register(function ($classname) {
     if (file_exists($filename)) {
         if (stripos($classname, 'WeChat') === 0) include $filename;
         elseif (stripos($classname, 'WeMini') === 0) include $filename;
-        elseif (stripos($classname, 'WePay') === 0) include $filename;
         elseif (stripos($classname, 'AliPay') === 0) include $filename;
+        elseif (stripos($classname, 'WePay') === 0) include $filename;
         elseif ($classname === 'We') include $filename;
     }
 });
\ No newline at end of file

From 7a46d4f27153773de35cd98a87c356b15082b358 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 19:07:00 +0800
Subject: [PATCH 096/161] Update composer.json

---
 composer.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 5ed2a6e..fb3fc43 100644
--- a/composer.json
+++ b/composer.json
@@ -30,8 +30,9 @@
     ],
     "psr-4": {
       "WePay\\": "WePay",
-      "WeChat\\": "WeChat",
-      "WeMini\\": "WeMini"
+      "WeMini\\": "WeMini",
+      "AliPay\\": "AliPay",
+      "WeChat\\": "WeChat"
     }
   }
 }
\ No newline at end of file

From afa36b0c661fd0d5344826157afb095bf8bfc30a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 19:08:35 +0800
Subject: [PATCH 097/161] Update composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index fb3fc43..dc28123 100644
--- a/composer.json
+++ b/composer.json
@@ -31,8 +31,8 @@
     "psr-4": {
       "WePay\\": "WePay",
       "WeMini\\": "WeMini",
-      "AliPay\\": "AliPay",
-      "WeChat\\": "WeChat"
+      "WeChat\\": "WeChat",
+      "AliPay\\": "AliPay"
     }
   }
 }
\ No newline at end of file

From 05956dd93a450eb7782d23610a135e4751822c8b Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Oct 2018 19:08:56 +0800
Subject: [PATCH 098/161] Update composer.json

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

diff --git a/composer.json b/composer.json
index dc28123..0e8cfa4 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,7 @@
   ],
   "keywords": [
     "WePay",
+    "AliPay",
     "WeMini",
     "WeChat",
     "WeChatPay",

From 886b9d8c5461deee1b64d45c2c7453bc0e1935e5 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 1 Nov 2018 14:21:55 +0800
Subject: [PATCH 099/161] Update We.php

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

diff --git a/We.php b/We.php
index 3845137..144d7b0 100644
--- a/We.php
+++ b/We.php
@@ -74,7 +74,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.1.12';
+    const VERSION = '1.2.2';
 
     /**
      * 静态配置

From 8a323d39c757c35bd283a593c6bb9b234e965c95 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 3 Nov 2018 08:58:24 +0800
Subject: [PATCH 100/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=8E=9F=E6=94=AF=E4=BB=98=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/{WePay.php => Pay.php} | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
 rename WeChat/{WePay.php => Pay.php} (91%)

diff --git a/WeChat/WePay.php b/WeChat/Pay.php
similarity index 91%
rename from WeChat/WePay.php
rename to WeChat/Pay.php
index 1820de5..5030ab5 100644
--- a/WeChat/WePay.php
+++ b/WeChat/Pay.php
@@ -27,13 +27,14 @@ use WePay\TransfersBank;
  * Class Pay
  * @package WeChat\Contracts
  */
-class WePay extends BasicWePay
+class Pay extends BasicWePay
 {
 
     /**
      * 统一下单
      * @param array $options
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function createOrder(array $options)
@@ -69,6 +70,7 @@ class WePay extends BasicWePay
      * 查询订单
      * @param array $options
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function queryOrder(array $options)
@@ -81,6 +83,7 @@ class WePay extends BasicWePay
      * 关闭订单
      * @param string $out_trade_no 商户订单号
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function closeOrder($out_trade_no)
@@ -93,6 +96,7 @@ class WePay extends BasicWePay
      * 申请退款
      * @param array $options
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function createRefund(array $options)
@@ -105,6 +109,7 @@ class WePay extends BasicWePay
      * 查询退款
      * @param array $options
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function queryRefund(array $options)
@@ -117,6 +122,7 @@ class WePay extends BasicWePay
      * 交易保障
      * @param array $options
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function report(array $options)
@@ -129,6 +135,7 @@ class WePay extends BasicWePay
      * 授权码查询openid
      * @param string $authCode 扫码支付授权码，设备读取用户微信中的条码或者二维码信息
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function queryAuthCode($authCode)
@@ -167,7 +174,8 @@ class WePay extends BasicWePay
      * 企业付款到零钱
      * @param array $options
      * @return array
-     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     * @throws InvalidResponseException
      */
     public function createTransfers(array $options)
     {
@@ -179,6 +187,7 @@ class WePay extends BasicWePay
      * 查询企业付款到零钱
      * @param string $partner_trade_no 商户调用企业付款API时使用的商户订单号
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function queryTransfers($partner_trade_no)
@@ -205,6 +214,7 @@ class WePay extends BasicWePay
      * 商户企业付款到银行卡操作进行结果查询
      * @param string $partner_trade_no 商户订单号，需保持唯一
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function queryTransFresBank($partner_trade_no)

From 7e89f110da89e44e32b1abf5a15b2d107e3b30d5 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 3 Nov 2018 09:01:29 +0800
Subject: [PATCH 101/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=8E=9F=E6=94=AF=E4=BB=98=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php                             | 2 +-
 _test/pay-download-bill.php        | 2 +-
 _test/pay-order-close.php          | 2 +-
 _test/pay-order-create.php         | 2 +-
 _test/pay-order-query.php          | 2 +-
 _test/pay-refund-create.php        | 2 +-
 _test/pay-refund-query.php         | 2 +-
 _test/pay-transfers-create.php     | 2 +-
 _test/pay-transfersbank-create.php | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/We.php b/We.php
index 144d7b0..fd3be40 100644
--- a/We.php
+++ b/We.php
@@ -30,7 +30,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WeChat\Media WeChatMedia($options = []) static 微信素材管理
  * @method \WeChat\Menu WeChatMenu($options = []) static 微信菜单管理
  * @method \WeChat\Oauth WeChatOauth($options = []) static 微信网页授权
- * @method \WeChat\WePay WeChatPay($options = []) static 微信支付商户
+ * @method \WeChat\Pay WeChatPay($options = []) static 微信支付商户
  * @method \WeChat\Product WeChatProduct($options = []) static 微信商店管理
  * @method \WeChat\Qrcode WeChatQrcode($options = []) static 微信二维码管理
  * @method \WeChat\Receive WeChatReceive($options = []) static 微信推送管理
diff --git a/_test/pay-download-bill.php b/_test/pay-download-bill.php
index 3bcf9a8..c0181fb 100644
--- a/_test/pay-download-bill.php
+++ b/_test/pay-download-bill.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\WePay($config);
+    $wechat = new \WeChat\Pay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-order-close.php b/_test/pay-order-close.php
index a70cae5..3a31ddc 100644
--- a/_test/pay-order-close.php
+++ b/_test/pay-order-close.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\WePay($config);
+    $wechat = new \WeChat\Pay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = '1217752501201407033233368018';
diff --git a/_test/pay-order-create.php b/_test/pay-order-create.php
index 21dfea8..e130bb1 100644
--- a/_test/pay-order-create.php
+++ b/_test/pay-order-create.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\WePay($config);
+    $wechat = new \WeChat\Pay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-order-query.php b/_test/pay-order-query.php
index 7e7151c..d993488 100644
--- a/_test/pay-order-query.php
+++ b/_test/pay-order-query.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\WePay($config);
+    $wechat = new \WeChat\Pay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-refund-create.php b/_test/pay-refund-create.php
index 8447f06..02b554b 100644
--- a/_test/pay-refund-create.php
+++ b/_test/pay-refund-create.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\WePay($config);
+    $wechat = new \WeChat\Pay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-refund-query.php b/_test/pay-refund-query.php
index 7383b89..a812ac4 100644
--- a/_test/pay-refund-query.php
+++ b/_test/pay-refund-query.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\WePay($config);
+    $wechat = new \WeChat\Pay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-transfers-create.php b/_test/pay-transfers-create.php
index 889bd19..77d70b0 100644
--- a/_test/pay-transfers-create.php
+++ b/_test/pay-transfers-create.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\WePay($config);
+    $wechat = new \WeChat\Pay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-transfersbank-create.php b/_test/pay-transfersbank-create.php
index f70d12d..92147af 100644
--- a/_test/pay-transfersbank-create.php
+++ b/_test/pay-transfersbank-create.php
@@ -21,7 +21,7 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\WePay($config);
+    $wechat = new \WeChat\Pay($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [

From af3fbadb4a0ffab4fcfd661605d60e13b5090314 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 3 Nov 2018 09:13:07 +0800
Subject: [PATCH 102/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/include.php b/include.php
index 8cf8d6d..06fd3b2 100644
--- a/include.php
+++ b/include.php
@@ -21,4 +21,5 @@ spl_autoload_register(function ($classname) {
         elseif (stripos($classname, 'WePay') === 0) include $filename;
         elseif ($classname === 'We') include $filename;
     }
+    return false;
 });
\ No newline at end of file

From a2d43b86b0092af954bbdc95b4312cbb7e182e79 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 3 Nov 2018 09:20:32 +0800
Subject: [PATCH 103/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=BC=95=E5=85=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/include.php b/include.php
index 06fd3b2..e88c70e 100644
--- a/include.php
+++ b/include.php
@@ -13,13 +13,15 @@
 // +----------------------------------------------------------------------
 
 spl_autoload_register(function ($classname) {
-    $filename = __DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
-    if (file_exists($filename)) {
-        if (stripos($classname, 'WeChat') === 0) include $filename;
-        elseif (stripos($classname, 'WeMini') === 0) include $filename;
-        elseif (stripos($classname, 'AliPay') === 0) include $filename;
-        elseif (stripos($classname, 'WePay') === 0) include $filename;
-        elseif ($classname === 'We') include $filename;
+    $pathname = __DIR__ . DIRECTORY_SEPARATOR;
+    $filename = str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
+    if (file_exists($pathname . $filename)) {
+        foreach (['WeChat', 'WeMini', 'AliPay', 'WePay', 'We'] as $prefix) {
+            if (stripos($classname, $prefix) === 0) {
+                include $pathname . $filename;
+                return true;
+            }
+        }
     }
     return false;
 });
\ No newline at end of file

From 42a07c153b01e624be885af831a5b170ce24bf10 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 12 Nov 2018 14:37:32 +0800
Subject: [PATCH 104/161] Update WeChat/Script.php

---
 WeChat/Script.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/WeChat/Script.php b/WeChat/Script.php
index a8a664d..59099d2 100644
--- a/WeChat/Script.php
+++ b/WeChat/Script.php
@@ -14,8 +14,8 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\Tools;
 use WeChat\Contracts\BasicWeChat;
+use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidResponseException;
 
 /**
@@ -104,18 +104,14 @@ class Script extends BasicWeChat
      * 数据生成签名
      * @param array $data 签名数组
      * @param string $method 签名方法
+     * @param array $params 签名参数
      * @return bool|string 签名值
      */
-    protected function getSignature($data, $method = "sha1")
+    protected function getSignature($data, $method = "sha1", $params = [])
     {
-        if (!function_exists($method)) {
-            return false;
-        }
         ksort($data);
-        $params = [];
-        foreach ($data as $key => $value) {
-            $params[] = "{$key}={$value}";
-        }
+        if (!function_exists($method)) return false;
+        foreach ($data as $k => $v) array_push($params, "{$k}={$v}");
         return $method(join('&', $params));
     }
 }
\ No newline at end of file

From f8c8c9d317aa57b7b5622f1bb75e217b3b1d3c9a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 12 Nov 2018 21:58:40 +0800
Subject: [PATCH 105/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=B8=AA=E6=80=A7?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=20#17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/Pos.php                   | 2 +-
 AliPay/Scan.php                  | 2 +-
 WeChat/Contracts/BasicAliPay.php | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/AliPay/Pos.php b/AliPay/Pos.php
index b173082..e24df3e 100644
--- a/AliPay/Pos.php
+++ b/AliPay/Pos.php
@@ -42,6 +42,6 @@ class Pos extends BasicAliPay
      */
     public function apply($options)
     {
-        return $this->getResult($options);
+        return $this->getResult($options, 'get');
     }
 }
\ No newline at end of file
diff --git a/AliPay/Scan.php b/AliPay/Scan.php
index b86afc1..d2571f0 100644
--- a/AliPay/Scan.php
+++ b/AliPay/Scan.php
@@ -41,6 +41,6 @@ class Scan extends BasicAliPay
      */
     public function apply($options)
     {
-        return $this->getResult($options);
+        return $this->getResult($options, 'get');
     }
 }
\ No newline at end of file
diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 826446e..cca833c 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -190,13 +190,14 @@ abstract class BasicAliPay
     /**
      * 请求接口并验证访问数据
      * @param array $options
+     * @param string $method
      * @return array|boolean
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    protected function getResult($options)
+    protected function getResult($options, $method = 'post')
     {
         $this->applyData($options);
-        $data = json_decode(Tools::post($this->gateway, $this->options->get()), true);
+        $data = json_decode(Tools::$method($this->gateway, $this->options->get()), true);
         $method = str_replace('.', '_', $this->options['method']) . '_response';
         if (!isset($data[$method]['code']) || $data[$method]['code'] !== '10000') {
             throw new \WeChat\Exceptions\InvalidResponseException(

From dd9ff2856f68301b77d0102b93334c61081a7fa3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 12 Nov 2018 22:04:06 +0800
Subject: [PATCH 106/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=20#17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/Bill.php                  | 2 +-
 AliPay/Pos.php                   | 2 +-
 AliPay/Scan.php                  | 2 +-
 WeChat/Contracts/BasicAliPay.php | 5 ++---
 _test/alipay-bill.php            | 6 ++----
 _test/alipay-transfer.php        | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/AliPay/Bill.php b/AliPay/Bill.php
index 4717197..8817f1d 100644
--- a/AliPay/Bill.php
+++ b/AliPay/Bill.php
@@ -41,6 +41,6 @@ class Bill extends BasicAliPay
      */
     public function apply($options)
     {
-        return $this->getResult($options);
+        return $this->getResult($options, 'get');
     }
 }
\ No newline at end of file
diff --git a/AliPay/Pos.php b/AliPay/Pos.php
index e24df3e..b173082 100644
--- a/AliPay/Pos.php
+++ b/AliPay/Pos.php
@@ -42,6 +42,6 @@ class Pos extends BasicAliPay
      */
     public function apply($options)
     {
-        return $this->getResult($options, 'get');
+        return $this->getResult($options);
     }
 }
\ No newline at end of file
diff --git a/AliPay/Scan.php b/AliPay/Scan.php
index d2571f0..b86afc1 100644
--- a/AliPay/Scan.php
+++ b/AliPay/Scan.php
@@ -41,6 +41,6 @@ class Scan extends BasicAliPay
      */
     public function apply($options)
     {
-        return $this->getResult($options, 'get');
+        return $this->getResult($options);
     }
 }
\ No newline at end of file
diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index cca833c..c5bfd6c 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -190,14 +190,13 @@ abstract class BasicAliPay
     /**
      * 请求接口并验证访问数据
      * @param array $options
-     * @param string $method
      * @return array|boolean
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    protected function getResult($options, $method = 'post')
+    protected function getResult($options)
     {
         $this->applyData($options);
-        $data = json_decode(Tools::$method($this->gateway, $this->options->get()), true);
+        $data = json_decode(Tools::get($this->gateway, $this->options->get()), true);
         $method = str_replace('.', '_', $this->options['method']) . '_response';
         if (!isset($data[$method]['code']) || $data[$method]['code'] !== '10000') {
             throw new \WeChat\Exceptions\InvalidResponseException(
diff --git a/_test/alipay-bill.php b/_test/alipay-bill.php
index bade9d4..3ed1109 100644
--- a/_test/alipay-bill.php
+++ b/_test/alipay-bill.php
@@ -24,13 +24,11 @@ try {
     // $pay = new \AliPay\Bill($config);
     // 请参考（请求参数）：https://docs.open.alipay.com/api_15/alipay.data.dataservice.bill.downloadurl.query
     $result = $pay->apply([
-        'bill_date' => '2017-11-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
+        'bill_date' => '2018-10-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
         'bill_type' => 'signcustomer', // 账单类型(trade指商户基于支付宝交易收单的业务账单,signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单)
     ]);
     echo '<pre>';
     var_export($result);
 } catch (Exception $e) {
     echo $e->getMessage();
-}
-
-
+}
\ No newline at end of file
diff --git a/_test/alipay-transfer.php b/_test/alipay-transfer.php
index 54ba8ac..16b56aa 100644
--- a/_test/alipay-transfer.php
+++ b/_test/alipay-transfer.php
@@ -24,7 +24,7 @@ try {
     // $pay = new \AliPay\Scan($config);
     // 参考链接：https://docs.open.alipay.com/api_28/alipay.fund.trans.toaccount.transfer
     $result = $pay->apply([
-        'out_biz_no'      => '', // 订单号
+        'out_biz_no'      => time(), // 订单号
         'payee_type'      => 'ALIPAY_LOGONID', // 收款方账户类型(ALIPAY_LOGONID | ALIPAY_USERID)
         'payee_account'   => 'demo@sandbox.com', // 收款方账户
         'amount'          => '10', // 转账金额

From b8fd2795c72368888ff1810daa95ae035fad1110 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 12 Nov 2018 22:10:45 +0800
Subject: [PATCH 107/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index c5bfd6c..15534c3 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -200,11 +200,10 @@ abstract class BasicAliPay
         $method = str_replace('.', '_', $this->options['method']) . '_response';
         if (!isset($data[$method]['code']) || $data[$method]['code'] !== '10000') {
             throw new \WeChat\Exceptions\InvalidResponseException(
-                "\nResultError" .
-                (empty($data[$method]['code']) ? '' : "\n{$data[$method]['msg']}[{$data[$method]['code']}]") .
-                (empty($data[$method]['sub_code']) ? '' : "\n{$data[$method]['sub_msg']}[{$data[$method]['sub_code']}]\n"),
-                $data[$method]['code'],
-                $data
+                "Error: " .
+                (empty($data[$method]['code']) ? '' : "{$data[$method]['msg']} [{$data[$method]['code']}]\r\n") .
+                (empty($data[$method]['sub_code']) ? '' : "{$data[$method]['sub_msg']} [{$data[$method]['sub_code']}]\r\n"),
+                $data[$method]['code'], $data
             );
         }
         return $this->verify($data[$method], $data['sign'], true);

From d8a3b73f581c3df33b4b920c35fa3f0c094268d5 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 12 Nov 2018 22:21:08 +0800
Subject: [PATCH 108/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/We.php b/We.php
index fd3be40..ca9e066 100644
--- a/We.php
+++ b/We.php
@@ -74,7 +74,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.2';
+    const VERSION = '1.2.3';
 
     /**
      * 静态配置

From fed0e83057e33430bf9e981c82bdbb61675e1a3d Mon Sep 17 00:00:00 2001
From: Anyon <Anyon@windows10.microdone.cn>
Date: Tue, 13 Nov 2018 09:40:49 +0800
Subject: [PATCH 109/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E5=8F=8A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                       |  3 ++-
 WeChat/Contracts/BasicAliPay.php |  2 +-
 WeChat/Contracts/BasicWeChat.php | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d13044c..3803ef2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 /vendor
 /Cache
 /Test/cert
-/composer.lock
+/nbproject
+/composer.lock
\ No newline at end of file
diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 15534c3..36140ce 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -196,8 +196,8 @@ abstract class BasicAliPay
     protected function getResult($options)
     {
         $this->applyData($options);
-        $data = json_decode(Tools::get($this->gateway, $this->options->get()), true);
         $method = str_replace('.', '_', $this->options['method']) . '_response';
+        $data = json_decode(Tools::get($this->gateway, $this->options->get()), true);
         if (!isset($data[$method]['code']) || $data[$method]['code'] !== '10000') {
             throw new \WeChat\Exceptions\InvalidResponseException(
                 "Error: " .
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 30bbc25..3dd4eb0 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -148,10 +148,12 @@ class BasicWeChat
         try {
             return Tools::json2arr(Tools::get($url));
         } catch (InvalidResponseException $e) {
-            if (!$this->isTry && in_array($e->getCode(), ['40014', '40001', '41001', '42001'])) {
-                $this->delAccessToken();
-                $this->isTry = true;
-                return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
+            if (isset($this->currentMethod['method']) && empty($this->isTry)) {
+                if (in_array($e->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());
         }

From ace4ce3949821588c34641fbadda4461725b5fbe Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 17:05:11 +0800
Subject: [PATCH 110/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=8E=B7=E5=8F=96=E6=A0=87=E7=AD=BE=E4=B8=8B=E7=B2=89?=
 =?UTF-8?q?=E4=B8=9D=E5=88=97=E8=A1=A8=20=20#2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/User.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/WeChat/User.php b/WeChat/User.php
index 742cd6f..c362ccd 100644
--- a/WeChat/User.php
+++ b/WeChat/User.php
@@ -87,6 +87,21 @@ class User extends BasicWeChat
         return $this->httpGetForJson($url);
     }
 
+    /**
+     * 获取标签下粉丝列表
+     * @param integer $tagid 标签ID
+     * @param string $next_openid 第一个拉取的OPENID
+     * @return array
+     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     */
+    public function getUserListByTag($tagid, $next_openid = '')
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/user/tag/get?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->httpPostForJson($url, ['tagid' => $tagid, 'next_openid' => $next_openid]);
+    }
+
     /**
      * 获取公众号的黑名单列表
      * @param string $begin_openid

From 7d02bdc83f776875b3b109d2e95722de195ede69 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 17:17:53 +0800
Subject: [PATCH 111/161] Update We.php

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

diff --git a/We.php b/We.php
index ca9e066..0705676 100644
--- a/We.php
+++ b/We.php
@@ -74,7 +74,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.3';
+    const VERSION = '1.2.5';
 
     /**
      * 静态配置

From ef2ab99cb4addbbeaeda6ae585d580794b4e984a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 17:37:19 +0800
Subject: [PATCH 112/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=20#19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicAliPay.php | 4 ++--
 _test/alipay-wap.php             | 3 +--
 _test/alipay-web.php             | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 36140ce..2f60801 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -183,7 +183,7 @@ abstract class BasicAliPay
      */
     protected function applyData($options)
     {
-        $this->options['biz_content'] = json_encode($options, JSON_UNESCAPED_UNICODE);
+        $this->options['biz_content'] = json_encode($this->params->merge($options), JSON_UNESCAPED_UNICODE);
         $this->options['sign'] = $this->getSign();
     }
 
@@ -216,7 +216,7 @@ abstract class BasicAliPay
     protected function buildPayHtml()
     {
         $html = "<form id='alipaysubmit' name='alipaysubmit' action='{$this->gateway}' method='post'>";
-        foreach ($this->params->get() as $key => $value) {
+        foreach ($this->options->get() as $key => $value) {
             $value = str_replace("'", '&apos;', $value);
             $html .= "<input type='hidden' name='{$key}' value='{$value}'/>";
         }
diff --git a/_test/alipay-wap.php b/_test/alipay-wap.php
index 8a0aab3..3b63833 100644
--- a/_test/alipay-wap.php
+++ b/_test/alipay-wap.php
@@ -31,8 +31,7 @@ try {
         'total_amount' => '1', // 支付金额
         'subject'      => '支付订单描述', // 支付订单描述
     ]);
-    echo '<pre>';
-    var_export($result);
+    echo $result;
 } catch (Exception $e) {
     echo $e->getMessage();
 }
diff --git a/_test/alipay-web.php b/_test/alipay-web.php
index 2225f11..e0e3b86 100644
--- a/_test/alipay-web.php
+++ b/_test/alipay-web.php
@@ -32,8 +32,7 @@ try {
         'total_amount' => '1', // 支付金额
         'subject'      => '支付订单描述', // 支付订单描述
     ]);
-    echo '<pre>';
-    var_export($result);
+    echo $result;
 } catch (Exception $e) {
     echo $e->getMessage();
 }

From 1defe142e4320aa29eaaf7af372912ff7b8d09e7 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 17:42:55 +0800
Subject: [PATCH 113/161] Update AliPay/Bill.php

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

diff --git a/AliPay/Bill.php b/AliPay/Bill.php
index 8817f1d..4717197 100644
--- a/AliPay/Bill.php
+++ b/AliPay/Bill.php
@@ -41,6 +41,6 @@ class Bill extends BasicAliPay
      */
     public function apply($options)
     {
-        return $this->getResult($options, 'get');
+        return $this->getResult($options);
     }
 }
\ No newline at end of file

From eea8198d466ddc7ba997148066fe55577bff4383 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 17:45:54 +0800
Subject: [PATCH 114/161] Update _test/config.php

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

diff --git a/_test/config.php b/_test/config.php
index 687b2dd..010618c 100644
--- a/_test/config.php
+++ b/_test/config.php
@@ -15,7 +15,7 @@
 return [
     'token'          => 'test',
     'appid'          => 'wx60a43dd8161666d4',
-    'appsecret'      => '71308e96a204296c57d7cd4b21b883e8',
+    'appsecret'      => 'b4e28746f1bd73b5c6684f5e01883c36',
     'encodingaeskey' => 'BJIUzE0gqlWy0GxfPp4J1oPTBmOrNDIGPNav1YFH5Z5',
     // 配置商户支付参数
     'mch_id'         => "1332187001",

From 02bd663288a09a213fb0fa6d3a59c20f776774bb Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 17:46:37 +0800
Subject: [PATCH 115/161] Update _test/wechat-user-get.php

---
 _test/wechat-user-get.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_test/wechat-user-get.php b/_test/wechat-user-get.php
index 5517afa..ad94e3a 100644
--- a/_test/wechat-user-get.php
+++ b/_test/wechat-user-get.php
@@ -26,6 +26,7 @@ try {
     // 4. 获取用户列表
     $result = $wechat->getUserList();
 
+    echo '<pre>';
     var_export($result);
 
     // 5. 批量获取用户资料

From 9db3744f478a139243f5639416d2edded8acaa15 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 18:00:47 +0800
Subject: [PATCH 116/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md        | 76 ++++++++++++++++++++++++++++++++++++++++++++++++
 _test/alipay.php |  2 +-
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a808709..8b8ac08 100644
--- a/README.md
+++ b/README.md
@@ -142,6 +142,82 @@ try {
 }
 ```
 
+支付宝支付
+----
+* 支付参数配置（可用沙箱模式）
+```php
+$config = [
+    // 沙箱模式
+    'debug'       => true,
+    // 应用ID
+    'appid'       => '2016090900468879',
+    // 支付宝公钥(1行填写)
+    '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=',
+    // 支付成功通知地址
+    'notify_url'  => '', // 可以应用的时候配置哦
+    // 网页支付回跳地址
+    'return_url'  => '', // 可以应用的时候配置哦
+];
+```
+* 支付宝发起PC网站支付
+```php
+
+// 参考公共参数  https://docs.open.alipay.com/203/107090/
+$config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
+$config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
+
+try {
+    
+    // 实例支付对象
+    $pay = We::AliPayWeb($config);
+    // $pay = new \AliPay\Web($config);
+    
+    // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.page.pay
+    $result = $pay->apply([
+        'out_trade_no' => time(), // 商户订单号
+        'total_amount' => '1',    // 支付金额
+        'subject'      => '支付订单描述', // 支付订单描述
+    ]);
+    
+    echo $result; // 直接输出HTML（提交表单跳转)
+    
+} catch (Exception $e) {
+
+    // 异常处理
+    echo $e->getMessage();
+    
+}
+```
+* 支付宝发起手机网站支付
+```php
+
+// 参考公共参数  https://docs.open.alipay.com/203/107090/
+$config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
+$config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
+
+try {
+    // 实例支付对象
+    $pay = We::AliPayWap($config);
+    // $pay = new \AliPay\Wap($config);
+    
+    // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.wap.pay
+    $result = $pay->apply([
+        'out_trade_no' => time(), // 商户订单号
+        'total_amount' => '1',    // 支付金额
+        'subject'      => '支付订单描述', // 支付订单描述
+    ]);
+    echo $result; // 直接输出HTML（提交表单跳转)
+} catch (Exception $e) {
+
+    // 异常处理
+    echo $e->getMessage();
+    
+}
+```
+* 更新功能请阅读测试代码或SDK封装源码
+
 开源协议
 ----
 * WeChatDeveloper 基于`MIT`协议发布，任何人可以用在任何地方，不受约束
diff --git a/_test/alipay.php b/_test/alipay.php
index f4fe48a..b803253 100644
--- a/_test/alipay.php
+++ b/_test/alipay.php
@@ -1,6 +1,6 @@
 <?php
-// 沙箱模式
 return [
+    // 沙箱模式
     'debug'       => true,
     // 应用ID
     'appid'       => '2016090900468879',

From c48d497f277b8643319c13236c7873b9a3f8fa90 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 18:08:37 +0800
Subject: [PATCH 117/161] Update README.md

---
 README.md | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8b8ac08..59214a4 100644
--- a/README.md
+++ b/README.md
@@ -142,6 +142,42 @@ try {
 }
 ```
 
+微信支付
+---
+```php
+  // 创建接口实例
+  $wechat = new \WeChat\Pay($config);
+  
+  // 组装参数，可以参考官方商户文档
+  $options = [
+      'body'             => '测试商品',
+      'out_trade_no'     => time(),
+      'total_fee'        => '1',
+      'openid'           => 'o38gpszoJoC9oJYz3UHHf6bEp0Lo',
+      'trade_type'       => 'JSAPI',
+      'notify_url'       => 'http://a.com/text.html',
+      'spbill_create_ip' => '127.0.0.1',
+  ];
+    
+try {
+
+    // 生成预支付码
+    $result = $wechat->createOrder($options);
+    
+    // 创建JSAPI参数签名
+    $options = $wechat->createParamsForJsApi($result['prepay_id']);
+    
+    // @todo 把 $options 传到前端用js发起支付就可以了
+    
+} catch (Exception $e) {
+
+    // 出错啦，处理下吧
+    echo $e->getMessage() . PHP_EOL;
+    
+}
+```
+* 更新功能请阅读测试代码或SDK封装源码
+
 支付宝支付
 ----
 * 支付参数配置（可用沙箱模式）
@@ -163,7 +199,6 @@ $config = [
 ```
 * 支付宝发起PC网站支付
 ```php
-
 // 参考公共参数  https://docs.open.alipay.com/203/107090/
 $config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
 $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
@@ -192,7 +227,6 @@ try {
 ```
 * 支付宝发起手机网站支付
 ```php
-
 // 参考公共参数  https://docs.open.alipay.com/203/107090/
 $config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
 $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
@@ -213,7 +247,7 @@ try {
 
     // 异常处理
     echo $e->getMessage();
-    
+
 }
 ```
 * 更新功能请阅读测试代码或SDK封装源码

From 7e9ec275be8565a39430b301395cdf259f6ec694 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 13 Nov 2018 18:31:49 +0800
Subject: [PATCH 118/161] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 59214a4..53f90c4 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,7 @@ try {
     
 }
 ```
-* 更新功能请阅读测试代码或SDK封装源码
+* 更多功能请阅读测试代码或SDK封装源码
 
 支付宝支付
 ----
@@ -250,7 +250,7 @@ try {
 
 }
 ```
-* 更新功能请阅读测试代码或SDK封装源码
+* 更多功能请阅读测试代码或SDK封装源码
 
 开源协议
 ----

From 37c8ab0afee09912f2cb9210105b922dbdf0eb78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 19 Nov 2018 21:24:17 +0800
Subject: [PATCH 119/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20notify=20#20=20=E3=80=90=E5=BE=85=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicAliPay.php | 82 +++++++++++++++++++-------------
 _test/alipay-app.php             |  3 +-
 _test/alipay-notify.php          | 33 ++++++-------
 _test/alipay.php                 | 13 +++++
 4 files changed, 82 insertions(+), 49 deletions(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 2f60801..77fe358 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -15,6 +15,7 @@
 namespace WeChat\Contracts;
 
 use WeChat\Exceptions\InvalidArgumentException;
+use WeChat\Exceptions\InvalidResponseException;
 
 /**
  * 支付宝支付基类
@@ -91,7 +92,7 @@ abstract class BasicAliPay
      * 查询支付宝订单状态
      * @param string $out_trade_no
      * @return array|boolean
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
      */
     public function query($out_trade_no = '')
     {
@@ -104,7 +105,7 @@ abstract class BasicAliPay
      * @param array|string $options 退款参数或退款商户订单号
      * @param null $refund_amount 退款金额
      * @return array|boolean
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
      */
     public function refund($options, $refund_amount = null)
     {
@@ -117,7 +118,7 @@ abstract class BasicAliPay
      * 关闭支付宝进行中的订单
      * @param array|string $options
      * @return array|boolean
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
      */
     public function close($options)
     {
@@ -126,23 +127,42 @@ abstract class BasicAliPay
         return $this->getResult($options);
     }
 
+    /**
+     * 获取通知数据
+     * @param boolean $needSignType 是否需要sign_type字段
+     * @return boolean|array
+     * @throws InvalidResponseException
+     */
+    public function notify($needSignType = false)
+    {
+        $data = $_POST;
+        if (empty($data) || empty($data['sign'])) {
+            throw new InvalidResponseException('Illegal push request.', 0, $data);
+        }
+        $string = $this->getSignContent($data, $needSignType);
+        $content = wordwrap($this->config->get('public_key'), 64, "\n", true);
+        $res = "-----BEGIN PUBLIC KEY-----\n{$content}\n-----END PUBLIC KEY-----";
+        if (openssl_verify($string, base64_decode($data['sign']), $res, OPENSSL_ALGO_SHA256) !== 1) {
+            throw new InvalidResponseException('Data signature verification failed.', 0, $data);
+        }
+        return $data;
+    }
+
     /**
      * 验证支付宝支付宝通知
      * @param array $data 通知数据
-     * @param null $sign 数据签名
-     * @param boolean $sync
-     * @return array|bool
+     * @param null|string $sign 数据签名
+     * @return array|boolean
+     * @throws InvalidResponseException
      */
-    public function verify($data, $sign = null, $sync = false)
+    protected function verify($data, $sign)
     {
-        if (is_null($this->config->get('public_key'))) {
-            throw new InvalidArgumentException('Missing Config -- [public_key]');
-        }
-        $sign = is_null($sign) ? $data['sign'] : $sign;
         $content = wordwrap($this->config->get('public_key'), 64, "\n", true);
-        $string = $sync ? json_encode($data) : $this->getSignContent($data, true);
         $res = "-----BEGIN PUBLIC KEY-----\n{$content}\n-----END PUBLIC KEY-----";
-        return openssl_verify($string, base64_decode($sign), $res, OPENSSL_ALGO_SHA256) === 1 ? $data : false;
+        if (openssl_verify(json_encode($data, 256), base64_decode($sign), $res, OPENSSL_ALGO_SHA256) !== 1) {
+            throw new InvalidResponseException('Data signature verification failed.');
+        }
+        return $data;
     }
 
     /**
@@ -151,30 +171,28 @@ abstract class BasicAliPay
      */
     protected function getSign()
     {
-        if (is_null($this->config->get('private_key'))) {
-            throw new InvalidArgumentException('Missing Config -- [private_key]');
-        }
         $content = wordwrap($this->config->get('private_key'), 64, "\n", true);
         $string = "-----BEGIN RSA PRIVATE KEY-----\n{$content}\n-----END RSA PRIVATE KEY-----";
-        openssl_sign($this->getSignContent($this->options->get()), $sign, $string, OPENSSL_ALGO_SHA256);
+        openssl_sign($this->getSignContent($this->options->get(), true), $sign, $string, OPENSSL_ALGO_SHA256);
         return base64_encode($sign);
     }
 
     /**
      * 数据签名处理
-     * @param array $data
-     * @param boolean $verify
-     * @param array $strs
+     * @param array $data 需要进行签名数据
+     * @param boolean $needSignType 是否需要sign_type字段
      * @return bool|string
      */
-    private function getSignContent(array $data, $verify = false, $strs = [])
+    private function getSignContent(array $data, $needSignType = false)
     {
-        ksort($data);
-        foreach ($data as $k => $v) if ($v !== '') {
-            if ($verify && $k != 'sign' && $k != 'sign_type') array_push($strs, "{$k}={$v}");
-            if (!$verify && $v !== '' && !is_null($v) && $k != 'sign' && '@' != substr($v, 0, 1)) array_push($strs, "{$k}={$v}");
+        list($attrs,) = [[], ksort($data)];
+        if (isset($data['sign'])) unset($data['sign']);
+        if (empty($needSignType)) unset($data['sign_type']);
+        foreach ($data as $key => $value) {
+            if ($value === '' || is_null($value)) continue;
+            array_push($attrs, "{$key}={$value}");
         }
-        return join('&', $strs);
+        return join('&', $attrs);
     }
 
     /**
@@ -183,15 +201,15 @@ abstract class BasicAliPay
      */
     protected function applyData($options)
     {
-        $this->options['biz_content'] = json_encode($this->params->merge($options), JSON_UNESCAPED_UNICODE);
-        $this->options['sign'] = $this->getSign();
+        $this->options->set('biz_content', json_encode($this->params->merge($options), 256));
+        $this->options->set('sign', $this->getSign());
     }
 
     /**
      * 请求接口并验证访问数据
      * @param array $options
      * @return array|boolean
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
      */
     protected function getResult($options)
     {
@@ -199,18 +217,18 @@ abstract class BasicAliPay
         $method = str_replace('.', '_', $this->options['method']) . '_response';
         $data = json_decode(Tools::get($this->gateway, $this->options->get()), true);
         if (!isset($data[$method]['code']) || $data[$method]['code'] !== '10000') {
-            throw new \WeChat\Exceptions\InvalidResponseException(
+            throw new InvalidResponseException(
                 "Error: " .
                 (empty($data[$method]['code']) ? '' : "{$data[$method]['msg']} [{$data[$method]['code']}]\r\n") .
                 (empty($data[$method]['sub_code']) ? '' : "{$data[$method]['sub_msg']} [{$data[$method]['sub_code']}]\r\n"),
                 $data[$method]['code'], $data
             );
         }
-        return $this->verify($data[$method], $data['sign'], true);
+        return $this->verify($data[$method], $data['sign']);
     }
 
     /**
-     * 生成支付html代码
+     * 生成支付HTML代码
      * @return string
      */
     protected function buildPayHtml()
diff --git a/_test/alipay-app.php b/_test/alipay-app.php
index a905328..bbfe18e 100644
--- a/_test/alipay-app.php
+++ b/_test/alipay-app.php
@@ -22,6 +22,7 @@ try {
     // 实例支付对象
     $pay = \We::AliPayApp($config);
     // $pay = new \AliPay\App($config);
+
     // 请参考（请求参数）：https://docs.open.alipay.com/api_1/alipay.trade.app.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
@@ -30,7 +31,7 @@ try {
     ]);
     echo '<pre>';
     var_export($result);
-} catch (Exception $e) {
+} catch (\Exception $e) {
     echo $e->getMessage();
 }
 
diff --git a/_test/alipay-notify.php b/_test/alipay-notify.php
index 9e9b84b..5802728 100644
--- a/_test/alipay-notify.php
+++ b/_test/alipay-notify.php
@@ -18,20 +18,21 @@ include "../include.php";
 // 2. 准备公众号配置参数
 $config = include "./alipay.php";
 
-// 实例支付对象
-$pay = \We::AliPayApp($config);
-// $pay = new \AliPay\App($config);
-if ($pay->verify($_POST)) {
-    file_put_contents('notify.txt', "收到来自支付宝的异步通知\r\n", FILE_APPEND);
-    file_put_contents('notify.txt', '订单号：' . $_POST['out_trade_no'] . "\r\n", FILE_APPEND);
-    file_put_contents('notify.txt', '订单金额：' . $_POST['total_amount'] . "\r\n\r\n", FILE_APPEND);
-} else {
-    file_put_contents('notify.txt', "收到异步通知\r\n", FILE_APPEND);
-}
-
-// 下面是支付通知处理
-$pay = new \AliPay\App($config);
-$notify = $pay->verify($_POST);
-if (in_array($notify['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
-    // @todo 更新订单状态，支付完成
+try {
+    // 实例支付对象
+    $pay = \We::AliPayApp($config);
+    // $pay = new \AliPay\App($config);
+    if ($data = $pay->notify()) {
+        if (in_array($data['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
+            // @todo 更新订单状态，支付完成
+        }
+        file_put_contents('notify.txt', "收到来自支付宝的异步通知\r\n", FILE_APPEND);
+        file_put_contents('notify.txt', '订单号：' . $data['out_trade_no'] . "\r\n", FILE_APPEND);
+        file_put_contents('notify.txt', '订单金额：' . $data['total_amount'] . "\r\n\r\n", FILE_APPEND);
+    } else {
+        file_put_contents('notify.txt', "收到异步通知\r\n", FILE_APPEND);
+    }
+} catch (\Exception $e) {
+    // 异常处理
+    echo $e->getMessage();
 }
diff --git a/_test/alipay.php b/_test/alipay.php
index b803253..4686507 100644
--- a/_test/alipay.php
+++ b/_test/alipay.php
@@ -1,4 +1,17 @@
 <?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
 return [
     // 沙箱模式
     'debug'       => true,

From 5e91d826538dc4764828dedb3f4db093bba35e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 19 Nov 2018 21:28:19 +0800
Subject: [PATCH 120/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=B3=A8=E9=87=8A=20#20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 77fe358..9a94c62 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -149,7 +149,7 @@ abstract class BasicAliPay
     }
 
     /**
-     * 验证支付宝支付宝通知
+     * 验证接口返回的数据签名
      * @param array $data 通知数据
      * @param null|string $sign 数据签名
      * @return array|boolean

From 0c824f2bcefc309da8eaaf77fab730ea2f4439b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 19 Nov 2018 21:35:36 +0800
Subject: [PATCH 121/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8DataAccess=E6=A0=87=E5=87=86=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 9a94c62..360d321 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -96,7 +96,7 @@ abstract class BasicAliPay
      */
     public function query($out_trade_no = '')
     {
-        $this->options['method'] = 'alipay.trade.query';
+        $this->options->set('method', 'alipay.trade.query');
         return $this->getResult(['out_trade_no' => $out_trade_no]);
     }
 
@@ -110,7 +110,7 @@ abstract class BasicAliPay
     public function refund($options, $refund_amount = null)
     {
         if (!is_array($options)) $options = ['out_trade_no' => $options, 'refund_amount' => $refund_amount];
-        $this->options['method'] = 'alipay.trade.refund';
+        $this->options->set('method', 'alipay.trade.refund');
         return $this->getResult($options);
     }
 
@@ -123,7 +123,7 @@ abstract class BasicAliPay
     public function close($options)
     {
         if (!is_array($options)) $options = ['out_trade_no' => $options];
-        $this->options['method'] = 'alipay.trade.close';
+        $this->options->set('method', 'alipay.trade.close');
         return $this->getResult($options);
     }
 

From e6be8222c2be8e70515876affd966ec1d22cc65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 19 Nov 2018 21:44:54 +0800
Subject: [PATCH 122/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5demo=20#20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/_test/alipay-notify.php b/_test/alipay-notify.php
index 5802728..311cb6a 100644
--- a/_test/alipay-notify.php
+++ b/_test/alipay-notify.php
@@ -22,10 +22,9 @@ try {
     // 实例支付对象
     $pay = \We::AliPayApp($config);
     // $pay = new \AliPay\App($config);
-    if ($data = $pay->notify()) {
-        if (in_array($data['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
-            // @todo 更新订单状态，支付完成
-        }
+    $data = $pay->notify();
+    if (in_array($data['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
+        // @todo 更新订单状态，支付完成
         file_put_contents('notify.txt', "收到来自支付宝的异步通知\r\n", FILE_APPEND);
         file_put_contents('notify.txt', '订单号：' . $data['out_trade_no'] . "\r\n", FILE_APPEND);
         file_put_contents('notify.txt', '订单金额：' . $data['total_amount'] . "\r\n\r\n", FILE_APPEND);

From 32931c9a04f420580a593f5e5ade1971f96170f7 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 20 Nov 2018 12:47:25 +0800
Subject: [PATCH 123/161] Update README.md

---
 README.md | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 53f90c4..636d4cf 100644
--- a/README.md
+++ b/README.md
@@ -45,13 +45,13 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
 
 |文件名|类名|描述|类型|加载 ①|
 |---|---|---|---|---|
-|  App.php  |  AliPay\App  |  支付宝App支付  |  支付宝  |  \We::AliPayApp() |
-|  Bill.php  |  AliPay\Bill  |  支付宝账单下载  |  支付宝  |  \We::AliPayBill() |
-|  Pos.php  |  AliPay\Pos  |  支付宝刷卡支付  |  支付宝  |  \We::AliPayPos() |
-|  Scan.php  |  AliPay\Scan  |  支付宝扫码支付  |  支付宝  |  \We::AliPayScan() |
-|  Transfer.php  |  AliPay\Transfer  |  支付宝转账  |  支付宝  |  \We::AliPayTransfer() |
-|  Wap.php  |  AliPay\Wap  |  支付宝Wap支付  |  支付宝  |  \We::AliPayWap() |
-|  Web.php  |  AliPay\Web  |  支付宝Web支付  |  支付宝  |  \We::AliPayWeb() |
+|  App.php  |  AliPay\App  |  支付宝App支付  |  支付宝支付  |  \We::AliPayApp() |
+|  Bill.php  |  AliPay\Bill  |  支付宝账单下载  |  支付宝支付  |  \We::AliPayBill() |
+|  Pos.php  |  AliPay\Pos  |  支付宝刷卡支付  |  支付宝支付  |  \We::AliPayPos() |
+|  Scan.php  |  AliPay\Scan  |  支付宝扫码支付  |  支付宝支付  |  \We::AliPayScan() |
+|  Transfer.php  |  AliPay\Transfer  |  支付宝转账  |  支付宝支付  |  \We::AliPayTransfer() |
+|  Wap.php  |  AliPay\Wap  |  支付宝Wap支付  |  支付宝支付  |  \We::AliPayWap() |
+|  Web.php  |  AliPay\Web  |  支付宝Web支付  |  支付宝支付  |  \We::AliPayWeb() |
 |  Card.php  |  WeChat\Card  |  微信卡券接口支持  |  认证服务号  |  \We::WeChatCard() |
 |  Custom.php  | WeChat\Custom   |  微信客服消息接口支持   |  认证服务号 | \We::WeChatCustom() |
 |  Media.php  | WeChat\Media   |  微信媒体素材接口支持  |  认证服务号 | \We::WeChatMedia() |
@@ -232,17 +232,20 @@ $config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
 $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
 
 try {
+
     // 实例支付对象
     $pay = We::AliPayWap($config);
     // $pay = new \AliPay\Wap($config);
-    
+
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.wap.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
         'total_amount' => '1',    // 支付金额
         'subject'      => '支付订单描述', // 支付订单描述
     ]);
+
     echo $result; // 直接输出HTML（提交表单跳转)
+
 } catch (Exception $e) {
 
     // 异常处理

From 70b986885297ce8fab0c6ebe2a027b3f9b3a0198 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 20 Nov 2018 17:41:20 +0800
Subject: [PATCH 124/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=A4=84=E7=90=86=E8=BF=94=E5=9B=9E=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=20getNotifySuccessReply?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicWePay.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WeChat/Contracts/BasicWePay.php b/WeChat/Contracts/BasicWePay.php
index f25cbda..1f0f096 100644
--- a/WeChat/Contracts/BasicWePay.php
+++ b/WeChat/Contracts/BasicWePay.php
@@ -85,6 +85,15 @@ class BasicWePay
         throw new InvalidResponseException('Invalid Notify.', '0');
     }
 
+    /**
+     * 获取微信支付通知回复内容
+     * @return string
+     */
+    public function getNotifySuccessReply()
+    {
+        return Tools::arr2xml(['return_code' => 'SUCCESS', 'return_msg' => 'OK']);
+    }
+
     /**
      * 生成支付签名
      * @param array $data 参与签名的数据

From 009f1eaeb7dfdfe33d06c1fb1db871658c78f521 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 20 Nov 2018 17:49:16 +0800
Subject: [PATCH 125/161] Create pay-order-notify.php

---
 _test/pay-order-notify.php | 42 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 _test/pay-order-notify.php

diff --git a/_test/pay-order-notify.php b/_test/pay-order-notify.php
new file mode 100644
index 0000000..3597f02
--- /dev/null
+++ b/_test/pay-order-notify.php
@@ -0,0 +1,42 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+try {
+
+    // 1. 手动加载入口文件
+    include "../include.php";
+
+    // 2. 准备公众号配置参数
+    $config = include "./config.php";
+
+    // 3. 创建接口实例
+    $wechat = new \WeChat\Pay($config);
+
+    // 4. 获取通知参数
+    $data = $wechat->getNotify();
+    if ($data['result_code'] === 'SUCCESS' && $data['result_code'] === 'SUCCESS') {
+        // @todo 去更新下原订单的支付状态
+        $order_no = $data['out_trade_no'];
+
+        // 返回接收成功的回复
+        ob_clean();
+        echo $wechat->getNotifySuccessReply();
+    }
+
+} catch (Exception $e) {
+
+    // 出错啦，处理下吧
+    echo $e->getMessage() . PHP_EOL;
+
+}
\ No newline at end of file

From 16cc72953551cb290ff7ad1938df1c720653a20d Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 26 Nov 2018 14:51:58 +0800
Subject: [PATCH 126/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Limit.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/WeChat/Limit.php b/WeChat/Limit.php
index ebd56d3..49304b5 100644
--- a/WeChat/Limit.php
+++ b/WeChat/Limit.php
@@ -38,5 +38,32 @@ class Limit extends BasicWeChat
         return $this->callPostApi($url, ['appid' => $this->config->get('appid')]);
     }
 
+    /**
+     * 网络检测
+     * @param string $action 执行的检测动作
+     * @param string $operator 指定平台从某个运营商进行检测
+     * @return array
+     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     */
+    public function ping($action = 'all', $operator = 'DEFAULT')
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/callback/check?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['action' => $action, 'check_operator' => $operator]);
+    }
+
+    /**
+     * 获取微信服务器IP地址
+     * @return array
+     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     */
+    public function getCallbackIp()
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->httpGetForJson($url);
+    }
 
 }
\ No newline at end of file

From 9ce8dbe0ddb92c1a6b50823f0c038c8a94c7e2c4 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 26 Nov 2018 14:58:35 +0800
Subject: [PATCH 127/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=90=8C=E6=AD=A5j?=
 =?UTF-8?q?sapi=5Fv.14=E6=8E=A5=E5=8F=A3=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Script.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/WeChat/Script.php b/WeChat/Script.php
index 59099d2..49d040c 100644
--- a/WeChat/Script.php
+++ b/WeChat/Script.php
@@ -87,15 +87,11 @@ class Script extends BasicWeChat
             "timestamp" => $data['timestamp'],
             "signature" => $this->getSignature($data, 'sha1'),
             'jsApiList' => [
-                'onWXDeviceBluetoothStateChange', 'onWXDeviceStateChange',
-                'openProductSpecificView', 'addCard', 'chooseCard', 'openCard',
-                'translateVoice', 'getNetworkType', 'openLocation', 'getLocation',
-                'onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone',
-                'chooseImage', 'previewImage', 'uploadImage', 'downloadImage', 'closeWindow', 'scanQRCode', 'chooseWXPay',
-                'hideOptionMenu', 'showOptionMenu', 'hideMenuItems', 'showMenuItems', 'hideAllNonBaseMenuItem', 'showAllNonBaseMenuItem',
-                'startScanWXDevice', 'stopScanWXDevice', 'onWXDeviceBindStateChange', 'onScanWXDeviceResult', 'onReceiveDataFromWXDevice',
+                'updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareWeibo', 'onMenuShareQZone',
                 'startRecord', 'stopRecord', 'onVoiceRecordEnd', 'playVoice', 'pauseVoice', 'stopVoice', 'onVoicePlayEnd', 'uploadVoice', 'downloadVoice',
-                'openWXDeviceLib', 'closeWXDeviceLib', 'getWXDeviceInfos', 'sendDataToWXDevice', 'disconnectWXDevice', 'getWXDeviceTicket', 'connectWXDevice',
+                'chooseImage', 'previewImage', 'uploadImage', 'downloadImage', 'translateVoice', 'getNetworkType', 'openLocation', 'getLocation',
+                'hideOptionMenu', 'showOptionMenu', 'hideMenuItems', 'showMenuItems', 'hideAllNonBaseMenuItem', 'showAllNonBaseMenuItem',
+                'closeWindow', 'scanQRCode', 'chooseWXPay', 'openProductSpecificView', 'addCard', 'chooseCard', 'openCard',
             ],
         ];
     }

From f5926e59fa2e33d1d69807213650e443b4590ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 27 Nov 2018 17:32:30 +0800
Subject: [PATCH 128/161] Rename README.md to readme.md

---
 README.md => readme.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README.md => readme.md (100%)

diff --git a/README.md b/readme.md
similarity index 100%
rename from README.md
rename to readme.md

From f4c08f4c81cce853b5433c41ead1caa795f7ddad Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 5 Dec 2018 15:25:42 +0800
Subject: [PATCH 129/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89CURLFILE=E7=B1=BB=EF=BC=88=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E8=B7=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/MyCurlFile.php | 55 +++++++++++++++++++++++++++++++++
 WeChat/Contracts/Tools.php      |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 WeChat/Contracts/MyCurlFile.php

diff --git a/WeChat/Contracts/MyCurlFile.php b/WeChat/Contracts/MyCurlFile.php
new file mode 100644
index 0000000..291c27e
--- /dev/null
+++ b/WeChat/Contracts/MyCurlFile.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace WeChat\Contracts;
+
+/**
+ * 自定义CURL文件类
+ * Class MyCurlFile
+ * @package WeChat\Contracts
+ */
+class MyCurlFile extends \stdClass
+{
+
+    /**
+     * MyCurlFile constructor.
+     * @param $filename
+     * @param string $mimetype
+     * @param string $postname
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function __construct($filename, $mimetype = '', $postname = '')
+    {
+
+        $this->mimetype = $mimetype;
+        $this->postname = $postname;
+        $this->content = base64_encode(file_get_contents($filename));
+        $this->extension = pathinfo($filename, PATHINFO_EXTENSION);
+        if (empty($this->extension)) $this->extension = 'tmp';
+        if (empty($this->mimetype)) $this->mimetype = Tools::getExtMine($this->extension);
+        if (empty($this->postname)) $this->postname = pathinfo($filename, PATHINFO_BASENAME);
+    }
+
+    /**
+     * 获取文件信息
+     * @return \CURLFile|string
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function get()
+    {
+        $this->tempname = rand(100000, 999999) . ".{$this->extension}";
+        $this->filename = Tools::pushFile($this->tempname, base64_decode($this->content));
+        if (class_exists('CURLFile')) {
+            return new \CURLFile($this->filename, $this->mimetype, $this->postname);
+        }
+        return "@{$this->tempname};filename={$this->postname};type={$this->mimetype}";
+    }
+
+    /**
+     * 类销毁处理
+     */
+    public function __destruct()
+    {
+        Tools::delCache($this->tempname);
+    }
+
+}
\ No newline at end of file
diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 40e2371..1037836 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -50,7 +50,7 @@ class Tools
 
     /**
      * 根据文件后缀获取文件MINE
-     * @param array $ext 文件后缀
+     * @param string|array $ext 文件后缀
      * @param array $mine 文件后缀MINE信息
      * @return string
      * @throws LocalCacheException

From 018918d342317f91b06978cef8d532ee16840623 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 5 Dec 2018 16:58:37 +0800
Subject: [PATCH 130/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0M?=
 =?UTF-8?q?yCurlFile=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Card.php                     |   4 +-
 WeChat/Contracts/BasicPushEvent.php |   5 +-
 WeChat/Contracts/BasicWeChat.php    |   6 +-
 WeChat/Contracts/MyCurlFile.php     |  30 +++++---
 WeChat/Contracts/Tools.php          | 112 ++++++++++++++++++----------
 WeChat/Limit.php                    |   1 -
 WeChat/Oauth.php                    |   4 +
 WeChat/Pay.php                      |   3 +-
 WeChat/Product.php                  |   1 -
 WeChat/Wifi.php                     |   1 -
 10 files changed, 103 insertions(+), 64 deletions(-)

diff --git a/WeChat/Card.php b/WeChat/Card.php
index 59cba2d..b392781 100644
--- a/WeChat/Card.php
+++ b/WeChat/Card.php
@@ -14,7 +14,6 @@
 
 namespace WeChat;
 
-
 use WeChat\Contracts\BasicWeChat;
 
 /**
@@ -669,6 +668,5 @@ class Card extends BasicWeChat
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->httpPostForJson($url, $data);
     }
-
-
+    
 }
\ No newline at end of file
diff --git a/WeChat/Contracts/BasicPushEvent.php b/WeChat/Contracts/BasicPushEvent.php
index 205075e..a221f18 100644
--- a/WeChat/Contracts/BasicPushEvent.php
+++ b/WeChat/Contracts/BasicPushEvent.php
@@ -165,10 +165,7 @@ class BasicPushEvent
         $signature = empty($msg_signature) ? $this->params->get('signature') : $msg_signature;
         $tmpArr = [$this->config->get('token'), $timestamp, $nonce, $str];
         sort($tmpArr, SORT_STRING);
-        if (sha1(implode($tmpArr)) == $signature) {
-            return true;
-        }
-        return false;
+        return sha1(implode($tmpArr)) === $signature;
     }
 
     /**
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 3dd4eb0..da8e2f8 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -141,7 +141,8 @@ class BasicWeChat
      * 以GET获取接口数据并转为数组
      * @param string $url 接口地址
      * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     protected function httpGetForJson($url)
     {
@@ -165,7 +166,8 @@ class BasicWeChat
      * @param array $data 请求数据
      * @param bool $buildToJson
      * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     protected function httpPostForJson($url, array $data, $buildToJson = true)
     {
diff --git a/WeChat/Contracts/MyCurlFile.php b/WeChat/Contracts/MyCurlFile.php
index 291c27e..e81e3da 100644
--- a/WeChat/Contracts/MyCurlFile.php
+++ b/WeChat/Contracts/MyCurlFile.php
@@ -9,24 +9,33 @@ namespace WeChat\Contracts;
  */
 class MyCurlFile extends \stdClass
 {
+    /**
+     * 当前数据类型
+     * @var string
+     */
+    public $datatype = 'MY_CURL_FILE';
 
     /**
      * MyCurlFile constructor.
-     * @param $filename
+     * @param string|array $filename
      * @param string $mimetype
      * @param string $postname
      * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function __construct($filename, $mimetype = '', $postname = '')
     {
-
-        $this->mimetype = $mimetype;
-        $this->postname = $postname;
-        $this->content = base64_encode(file_get_contents($filename));
-        $this->extension = pathinfo($filename, PATHINFO_EXTENSION);
-        if (empty($this->extension)) $this->extension = 'tmp';
-        if (empty($this->mimetype)) $this->mimetype = Tools::getExtMine($this->extension);
-        if (empty($this->postname)) $this->postname = pathinfo($filename, PATHINFO_BASENAME);
+        if (is_array($filename)) {
+            foreach ($filename as $k => $v) $this->{$k} = $v;
+        } else {
+            $this->mimetype = $mimetype;
+            $this->postname = $postname;
+            $this->extension = pathinfo($filename, PATHINFO_EXTENSION);
+            if (empty($this->extension)) $this->extension = 'tmp';
+            if (empty($this->mimetype)) $this->mimetype = Tools::getExtMine($this->extension);
+            if (empty($this->postname)) $this->postname = pathinfo($filename, PATHINFO_BASENAME);
+            $this->content = base64_encode(file_get_contents($filename));
+            $this->tempname = md5($this->content) . ".{$this->extension}";
+        }
     }
 
     /**
@@ -36,7 +45,6 @@ class MyCurlFile extends \stdClass
      */
     public function get()
     {
-        $this->tempname = rand(100000, 999999) . ".{$this->extension}";
         $this->filename = Tools::pushFile($this->tempname, base64_decode($this->content));
         if (class_exists('CURLFile')) {
             return new \CURLFile($this->filename, $this->mimetype, $this->postname);
@@ -49,7 +57,7 @@ class MyCurlFile extends \stdClass
      */
     public function __destruct()
     {
-        Tools::delCache($this->tempname);
+        // Tools::delCache($this->tempname);
     }
 
 }
\ No newline at end of file
diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 1037836..90db7ac 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -31,6 +31,11 @@ class Tools
      */
     public static $cache_path = null;
 
+    /**
+     * 网络缓存
+     * @var array
+     */
+    private static $cache_curl = [];
 
     /**
      * 产生随机字符串
@@ -49,7 +54,7 @@ class Tools
 
 
     /**
-     * 根据文件后缀获取文件MINE
+     * 根据文件后缀获取文件类型
      * @param string|array $ext 文件后缀
      * @param array $mine 文件后缀MINE信息
      * @return string
@@ -65,7 +70,7 @@ class Tools
     }
 
     /**
-     * 获取所有文件扩展的mine
+     * 获取所有文件扩展的类型
      * @return array
      * @throws LocalCacheException
      */
@@ -75,9 +80,7 @@ class Tools
         if (empty($mines)) {
             $content = file_get_contents('http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
             preg_match_all('#^([^\s]{2,}?)\s+(.+?)$#ism', $content, $matches, PREG_SET_ORDER);
-            foreach ($matches as $match) foreach (explode(" ", $match[2]) as $ext) {
-                $mines[$ext] = $match[1];
-            }
+            foreach ($matches as $match) foreach (explode(" ", $match[2]) as $ext) $mines[$ext] = $match[1];
             self::setCache('all_ext_mine', $mines);
         }
         return $mines;
@@ -93,8 +96,8 @@ class Tools
      */
     public static function createCurlFile($filename, $mimetype = null, $postname = null)
     {
-        is_null($postname) && $postname = basename($filename);
-        is_null($mimetype) && $mimetype = self::getExtMine(pathinfo($filename, 4));
+        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);
         }
@@ -182,7 +185,8 @@ class Tools
      * @param string $url 访问URL
      * @param array $query GET数
      * @param array $options
-     * @return bool|string
+     * @return boolean|string
+     * @throws LocalCacheException
      */
     public static function get($url, $query = [], $options = [])
     {
@@ -195,7 +199,8 @@ class Tools
      * @param string $url 访问URL
      * @param array $data POST数据
      * @param array $options
-     * @return bool|string
+     * @return boolean|string
+     * @throws LocalCacheException
      */
     public static function post($url, $data = [], $options = [])
     {
@@ -208,9 +213,10 @@ class Tools
      * @param string $method 请求方法
      * @param string $url 请求方法
      * @param array $options 请求参数[headers,data,ssl_cer,ssl_key]
-     * @return bool|string
+     * @return boolean|string
+     * @throws LocalCacheException
      */
-    protected static function doRequest($method, $url, $options = [])
+    public static function doRequest($method, $url, $options = [])
     {
         $curl = curl_init();
         // GET参数设置
@@ -224,34 +230,58 @@ class Tools
         // POST数据设置
         if (strtolower($method) === 'post') {
             curl_setopt($curl, CURLOPT_POST, true);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $options['data']);
+            curl_setopt($curl, CURLOPT_POSTFIELDS, self::_buildHttpData($options['data']));
         }
         // 证书文件设置
-        if (!empty($options['ssl_cer'])) {
-            if (file_exists($options['ssl_cer'])) {
-                curl_setopt($curl, CURLOPT_SSLCERTTYPE, 'PEM');
-                curl_setopt($curl, CURLOPT_SSLCERT, $options['ssl_cer']);
-            } else {
-                throw new InvalidArgumentException("Certificate files that do not exist. --- [ssl_cer]");
-            }
-        }
+        if (!empty($options['ssl_cer'])) if (file_exists($options['ssl_cer'])) {
+            curl_setopt($curl, CURLOPT_SSLCERTTYPE, 'PEM');
+            curl_setopt($curl, CURLOPT_SSLCERT, $options['ssl_cer']);
+        } else throw new InvalidArgumentException("Certificate files that do not exist. --- [ssl_cer]");
         // 证书文件设置
-        if (!empty($options['ssl_key'])) {
-            if (file_exists($options['ssl_key'])) {
-                curl_setopt($curl, CURLOPT_SSLKEYTYPE, 'PEM');
-                curl_setopt($curl, CURLOPT_SSLKEY, $options['ssl_key']);
-            } else {
-                throw new InvalidArgumentException("Certificate files that do not exist. --- [ssl_key]");
-            }
-        }
+        if (!empty($options['ssl_key'])) if (file_exists($options['ssl_key'])) {
+            curl_setopt($curl, CURLOPT_SSLKEYTYPE, 'PEM');
+            curl_setopt($curl, CURLOPT_SSLKEY, $options['ssl_key']);
+        } else throw new InvalidArgumentException("Certificate files that do not exist. --- [ssl_key]");
         curl_setopt($curl, CURLOPT_URL, $url);
         curl_setopt($curl, CURLOPT_TIMEOUT, 60);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
-        list($content, $status) = [curl_exec($curl), curl_getinfo($curl), curl_close($curl)];
-        return (intval($status["http_code"]) === 200) ? $content : false;
+        list($content) = [curl_exec($curl), curl_close($curl)];
+        // 清理 CURL 缓存文件
+        if (!empty(self::$cache_curl)) foreach (self::$cache_curl as $key => $file) {
+            Tools::delCache($file);
+            unset(self::$cache_curl[$key]);
+        }
+        return $content;
+    }
+
+    /**
+     * POST数据过滤处理
+     * @param array $data 需要处理的数据
+     * @param boolean $build 是否编译数据
+     * @return array|string
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    private static function _buildHttpData($data, $build = true)
+    {
+        if (!is_array($data)) return $data;
+        foreach ($data as $key => $value) {
+            if (is_object($value) && $value instanceof \CURLFile) {
+                $build = false;
+            } elseif (is_object($value) && isset($value->datatype) && $value->datatype === 'MY_CURL_FILE') {
+                $build = false;
+                $data[$key] = ($myCurlFile = new MyCurlFile((array)$value))->get();
+                array_push(self::$cache_curl, $myCurlFile->tempname);
+            } elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) {
+                if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) {
+                    $build = false;
+                    $data[$key] = self::createCurlFile($filename);
+                }
+            }
+        }
+        return $build ? http_build_query($data) : $data;
     }
 
     /**
@@ -263,8 +293,10 @@ class Tools
      */
     public static function pushFile($name, $content)
     {
-        $file = self::getCacheName($name);
-        if (!file_put_contents($file, $content)) throw new LocalCacheException('local file write error.', '0');
+        $file = self::_getCacheName($name);
+        if (!file_put_contents($file, $content)) {
+            throw new LocalCacheException('local file write error.', '0');
+        }
         return $file;
     }
 
@@ -278,9 +310,10 @@ class Tools
      */
     public static function setCache($name, $value = '', $expired = 3600)
     {
-        $file = self::getCacheName($name);
-        $content = serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]);
-        if (!file_put_contents($file, $content)) throw new LocalCacheException('local cache error.', '0');
+        $file = self::_getCacheName($name);
+        if (!file_put_contents($file, serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]))) {
+            throw new LocalCacheException('local cache error.', '0');
+        }
         return $file;
     }
 
@@ -291,8 +324,7 @@ class Tools
      */
     public static function getCache($name)
     {
-        $file = self::getCacheName($name);
-        if (file_exists($file) && ($content = file_get_contents($file))) {
+        if (file_exists($file = self::_getCacheName($name)) && ($content = file_get_contents($file))) {
             $data = unserialize($content);
             if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) {
                 return $data['value'];
@@ -305,11 +337,11 @@ class Tools
     /**
      * 移除缓存文件
      * @param string $name 缓存名称
-     * @return bool
+     * @return boolean
      */
     public static function delCache($name)
     {
-        $file = self::getCacheName($name);
+        $file = self::_getCacheName($name);
         return file_exists($file) ? unlink($file) : true;
     }
 
@@ -318,7 +350,7 @@ class Tools
      * @param string $name
      * @return string
      */
-    private static function getCacheName($name)
+    private static function _getCacheName($name)
     {
         if (empty(self::$cache_path)) {
             self::$cache_path = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
diff --git a/WeChat/Limit.php b/WeChat/Limit.php
index 49304b5..6ccc6f4 100644
--- a/WeChat/Limit.php
+++ b/WeChat/Limit.php
@@ -14,7 +14,6 @@
 
 namespace WeChat;
 
-
 use WeChat\Contracts\BasicWeChat;
 
 /**
diff --git a/WeChat/Oauth.php b/WeChat/Oauth.php
index 151a4ee..a8be272 100644
--- a/WeChat/Oauth.php
+++ b/WeChat/Oauth.php
@@ -42,6 +42,7 @@ class Oauth extends BasicWeChat
      * 通过 code 获取 AccessToken 和 openid
      * @return bool|array
      * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
      */
     public function getOauthAccessToken()
     {
@@ -57,6 +58,7 @@ class Oauth extends BasicWeChat
      * @param string $refresh_token
      * @return bool|array
      * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
      */
     public function getOauthRefreshToken($refresh_token)
     {
@@ -71,6 +73,7 @@ class Oauth extends BasicWeChat
      * @param string $openid 用户的唯一标识
      * @return array
      * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
      */
     public function checkOauthAccessToken($access_token, $openid)
     {
@@ -85,6 +88,7 @@ class Oauth extends BasicWeChat
      * @param string $lang 返回国家地区语言版本，zh_CN 简体，zh_TW 繁体，en 英语
      * @return array
      * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
      */
     public function getUserInfo($access_token, $openid, $lang = 'zh_CN')
     {
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 5030ab5..b063a43 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -162,12 +162,13 @@ class Pay extends BasicWePay
      * 拉取订单评价数据
      * @param array $options
      * @return array
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function billCommtent(array $options)
     {
         $pay = new Bill($this->config->get());
-        return $pay->commtent($options);
+        return $pay->comment($options);
     }
 
     /**
diff --git a/WeChat/Product.php b/WeChat/Product.php
index b1add21..74eb3ee 100644
--- a/WeChat/Product.php
+++ b/WeChat/Product.php
@@ -14,7 +14,6 @@
 
 namespace WeChat;
 
-
 use WeChat\Contracts\BasicWeChat;
 
 /**
diff --git a/WeChat/Wifi.php b/WeChat/Wifi.php
index ecc45a4..ff22aff 100644
--- a/WeChat/Wifi.php
+++ b/WeChat/Wifi.php
@@ -14,7 +14,6 @@
 
 namespace WeChat;
 
-
 use WeChat\Contracts\BasicWeChat;
 
 /**

From fbf73b5ca44da65c3df93b11b27998476260e227 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 5 Dec 2018 17:06:38 +0800
Subject: [PATCH 131/161] Update Tools.php

---
 WeChat/Contracts/Tools.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 90db7ac..4cc4305 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -267,18 +267,16 @@ class Tools
     private static function _buildHttpData($data, $build = true)
     {
         if (!is_array($data)) return $data;
-        foreach ($data as $key => $value) {
-            if (is_object($value) && $value instanceof \CURLFile) {
+        foreach ($data as $key => $value) if (is_object($value) && $value instanceof \CURLFile) {
+            $build = false;
+        } elseif (is_object($value) && isset($value->datatype) && $value->datatype === 'MY_CURL_FILE') {
+            $build = false;
+            $data[$key] = ($myCurlFile = new MyCurlFile((array)$value))->get();
+            array_push(self::$cache_curl, $myCurlFile->tempname);
+        } elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) {
+            if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) {
                 $build = false;
-            } elseif (is_object($value) && isset($value->datatype) && $value->datatype === 'MY_CURL_FILE') {
-                $build = false;
-                $data[$key] = ($myCurlFile = new MyCurlFile((array)$value))->get();
-                array_push(self::$cache_curl, $myCurlFile->tempname);
-            } elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) {
-                if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) {
-                    $build = false;
-                    $data[$key] = self::createCurlFile($filename);
-                }
+                $data[$key] = self::createCurlFile($filename);
             }
         }
         return $build ? http_build_query($data) : $data;
@@ -324,7 +322,8 @@ class Tools
      */
     public static function getCache($name)
     {
-        if (file_exists($file = self::_getCacheName($name)) && ($content = file_get_contents($file))) {
+        $file = self::_getCacheName($name);
+        if (file_exists($file) && ($content = file_get_contents($file))) {
             $data = unserialize($content);
             if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) {
                 return $data['value'];

From 365b012ec6d12465465abe62581bcbf6f0d65b63 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 12 Dec 2018 14:52:27 +0800
Subject: [PATCH 132/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0a?=
 =?UTF-8?q?pp=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B0=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php  | 13 ++++++++++++-
 WePay/Order.php | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index b063a43..062afdb 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -55,6 +55,17 @@ class Pay extends BasicWePay
         return $pay->jsapiParams($prepay_id);
     }
 
+    /**
+     * 获取APP支付参数
+     * @param string $prepay_id 统一下单预支付码
+     * @return array
+     */
+    public function createParamsForApp($prepay_id)
+    {
+        $pay = new Order($this->config->get());
+        return $pay->appParams($prepay_id);
+    }
+
     /**
      * 获取支付规则二维码
      * @param string $product_id 商户定义的商品id 或者订单号
@@ -65,7 +76,7 @@ class Pay extends BasicWePay
         $pay = new Order($this->config->get());
         return $pay->qrcParams($product_id);
     }
-
+    
     /**
      * 查询订单
      * @param array $options
diff --git a/WePay/Order.php b/WePay/Order.php
index 1b9de10..d20a318 100644
--- a/WePay/Order.php
+++ b/WePay/Order.php
@@ -100,6 +100,25 @@ class Order extends BasicWePay
         return "weixin://wxpay/bizpayurl?" . http_build_query($data);
     }
 
+    /**
+     * 获取微信App支付秘需参数
+     * @param string $prepayId 统一下单预支付码
+     * @return array
+     */
+    public function appParams($prepayId)
+    {
+        $data = [
+            'appid'      => $this->config->get('appid'),
+            'partnerid'  => $this->config->get('mch_id'),
+            'prepayid'   => (string)$prepayId,
+            'package'    => 'Sign=WXPay',
+            'time_stamp' => (string)time(),
+            'nonce_str'  => Tools::createNoncestr(),
+        ];
+        $data['sign'] = $this->getPaySign($data, 'MD5');
+        return $data;
+    }
+
     /**
      * 刷卡支付 撤销订单
      * @param array $options

From 63458d810ff14ed8889ad1f84b745225ee42c187 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 12 Dec 2018 17:59:07 +0800
Subject: [PATCH 133/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1App=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php  |  2 +-
 WePay/Order.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 062afdb..9045c00 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -76,7 +76,7 @@ class Pay extends BasicWePay
         $pay = new Order($this->config->get());
         return $pay->qrcParams($product_id);
     }
-    
+
     /**
      * 查询订单
      * @param array $options
diff --git a/WePay/Order.php b/WePay/Order.php
index d20a318..2b4a1f5 100644
--- a/WePay/Order.php
+++ b/WePay/Order.php
@@ -108,12 +108,12 @@ class Order extends BasicWePay
     public function appParams($prepayId)
     {
         $data = [
-            'appid'      => $this->config->get('appid'),
-            'partnerid'  => $this->config->get('mch_id'),
-            'prepayid'   => (string)$prepayId,
-            'package'    => 'Sign=WXPay',
-            'time_stamp' => (string)time(),
-            'nonce_str'  => Tools::createNoncestr(),
+            'appid'     => $this->config->get('appid'),
+            'partnerid' => $this->config->get('mch_id'),
+            'prepayid'  => (string)$prepayId,
+            'package'   => 'Sign=WXPay',
+            'timestamp' => (string)time(),
+            'noncestr'  => Tools::createNoncestr(),
         ];
         $data['sign'] = $this->getPaySign($data, 'MD5');
         return $data;

From 7fab512e058eb398241d785517545b422ee9d9ee Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 14 Dec 2018 15:13:07 +0800
Subject: [PATCH 134/161] Update Tools.php

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

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 4cc4305..974b028 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -96,12 +96,15 @@ class Tools
      */
     public static function createCurlFile($filename, $mimetype = null, $postname = null)
     {
-        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 (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);
+            }
+            return "@{$filename};filename={$postname};type={$mimetype}";
         }
-        return "@{$filename};filename={$postname};type={$mimetype}";
+        return $filename;
     }
 
     /**

From 9587b125b844cef0715e480985ec6b56128d8c3c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 14 Dec 2018 16:36:16 +0800
Subject: [PATCH 135/161] Update BasicPushEvent.php

---
 WeChat/Contracts/BasicPushEvent.php | 52 ++++++++++++++++-------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/WeChat/Contracts/BasicPushEvent.php b/WeChat/Contracts/BasicPushEvent.php
index a221f18..c21e6e4 100644
--- a/WeChat/Contracts/BasicPushEvent.php
+++ b/WeChat/Contracts/BasicPushEvent.php
@@ -43,18 +43,18 @@ class BasicPushEvent
      */
     protected $encryptType;
 
+    /**
+     * 公众号的推送请求参数
+     * @var DataArray
+     */
+    protected $input;
+
     /**
      * 当前公众号配置对象
      * @var DataArray
      */
     protected $config;
 
-    /**
-     * 公众号的推送请求参数
-     * @var DataArray
-     */
-    protected $params;
-
     /**
      * 公众号推送内容对象
      * @var DataArray
@@ -85,13 +85,13 @@ class BasicPushEvent
         }
         // 参数初始化
         $this->config = new DataArray($options);
-        $this->params = new DataArray($_REQUEST);
+        $this->input = new DataArray($_REQUEST);
         $this->appid = $this->config->get('appid');
         // 推送消息处理
         if ($_SERVER['REQUEST_METHOD'] == "POST") {
             $this->postxml = file_get_contents("php://input");
-            $this->encryptType = $this->params->get('encrypt_type');
-            if ($this->encryptType == 'aes') {
+            $this->encryptType = $this->input->get('encrypt_type');
+            if ($this->isEncrypt()) {
                 if (empty($options['encodingaeskey'])) {
                     throw new InvalidArgumentException("Missing Config -- [encodingaeskey]");
                 }
@@ -109,23 +109,33 @@ class BasicPushEvent
             $this->receive = new DataArray(Tools::xml2arr($this->postxml));
         } elseif ($_SERVER['REQUEST_METHOD'] == "GET" && $this->checkSignature()) {
             @ob_clean();
-            exit($this->params->get('echostr'));
+            exit($this->input->get('echostr'));
         } else {
             throw new InvalidResponseException('Invalid interface request.', '0');
         }
     }
 
+    /**
+     * 消息是否需要加密
+     * @return boolean
+     */
+    public function isEncrypt()
+    {
+        return $this->encryptType === 'aes';
+    }
+
     /**
      * 回复消息
      * @param array $data 消息内容
-     * @param bool $return 是否返回XML内容
+     * @param boolean $return 是否返回XML内容
+     * @param boolean $isEncrypt 是否加密内容
      * @return string
      * @throws InvalidDecryptException
      */
-    public function reply(array $data = [], $return = false)
+    public function reply(array $data = [], $return = false, $isEncrypt = false)
     {
         $xml = Tools::arr2xml(empty($data) ? $this->message : $data);
-        if ($this->encryptType == 'aes') {
+        if ($this->isEncrypt() || $isEncrypt) {
             if (!class_exists('Prpcrypt', false)) {
                 require __DIR__ . '/Prpcrypt.php';
             }
@@ -134,9 +144,7 @@ class BasicPushEvent
             $component_appid = $this->config->get('component_appid');
             $appid = empty($component_appid) ? $this->appid : $component_appid;
             $array = $prpcrypt->encrypt($xml, $appid);
-            if ($array[0] > 0) {
-                throw new InvalidDecryptException('Encrypt Error.', '0');
-            }
+            if ($array[0] > 0) throw new InvalidDecryptException('Encrypt Error.', '0');
             list($timestamp, $encrypt) = [time(), $array[1]];
             $nonce = rand(77, 999) * rand(605, 888) * rand(11, 99);
             $tmpArr = [$this->config->get('token'), $timestamp, $nonce, $encrypt];
@@ -145,9 +153,7 @@ class BasicPushEvent
             $format = "<xml><Encrypt><![CDATA[%s]]></Encrypt><MsgSignature><![CDATA[%s]]></MsgSignature><TimeStamp>%s</TimeStamp><Nonce><![CDATA[%s]]></Nonce></xml>";
             $xml = sprintf($format, $encrypt, $signature, $timestamp, $nonce);
         }
-        if ($return) {
-            return $xml;
-        }
+        if ($return) return $xml;
         @ob_clean();
         echo $xml;
     }
@@ -159,10 +165,10 @@ class BasicPushEvent
      */
     private function checkSignature($str = '')
     {
-        $nonce = $this->params->get('nonce');
-        $timestamp = $this->params->get('timestamp');
-        $msg_signature = $this->params->get('msg_signature');
-        $signature = empty($msg_signature) ? $this->params->get('signature') : $msg_signature;
+        $nonce = $this->input->get('nonce');
+        $timestamp = $this->input->get('timestamp');
+        $msg_signature = $this->input->get('msg_signature');
+        $signature = empty($msg_signature) ? $this->input->get('signature') : $msg_signature;
         $tmpArr = [$this->config->get('token'), $timestamp, $nonce, $str];
         sort($tmpArr, SORT_STRING);
         return sha1(implode($tmpArr)) === $signature;

From 9e117202873a3219b978eba6bac4c3c40b5cbc3c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 19 Dec 2018 15:58:04 +0800
Subject: [PATCH 136/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicAliPay.php | 4 ++++
 WeChat/Contracts/Tools.php       | 5 +++--
 WePay/Bill.php                   | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 360d321..cce79b9 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -93,6 +93,7 @@ abstract class BasicAliPay
      * @param string $out_trade_no
      * @return array|boolean
      * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function query($out_trade_no = '')
     {
@@ -106,6 +107,7 @@ abstract class BasicAliPay
      * @param null $refund_amount 退款金额
      * @return array|boolean
      * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function refund($options, $refund_amount = null)
     {
@@ -119,6 +121,7 @@ abstract class BasicAliPay
      * @param array|string $options
      * @return array|boolean
      * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function close($options)
     {
@@ -210,6 +213,7 @@ abstract class BasicAliPay
      * @param array $options
      * @return array|boolean
      * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     protected function getResult($options)
     {
diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index 974b028..b919e5c 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -274,8 +274,9 @@ class Tools
             $build = false;
         } elseif (is_object($value) && isset($value->datatype) && $value->datatype === 'MY_CURL_FILE') {
             $build = false;
-            $data[$key] = ($myCurlFile = new MyCurlFile((array)$value))->get();
-            array_push(self::$cache_curl, $myCurlFile->tempname);
+            $mycurl = new MyCurlFile((array)$value);
+            $data[$key] = $mycurl->get();
+            array_push(self::$cache_curl, $mycurl->tempname);
         } elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) {
             if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) {
                 $build = false;
diff --git a/WePay/Bill.php b/WePay/Bill.php
index 383da63..4c853c7 100644
--- a/WePay/Bill.php
+++ b/WePay/Bill.php
@@ -30,7 +30,8 @@ class Bill extends BasicWePay
      * @param array $options 静音参数
      * @param null|string $outType 输出类型
      * @return bool|string
-     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function download(array $options, $outType = null)
     {

From c0ce839061e23eab85349e3aa16c8aca845c1db3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 25 Dec 2018 09:48:22 +0800
Subject: [PATCH 137/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=AC=E9=92=A5=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/_test/alipay.php b/_test/alipay.php
index 4686507..818498f 100644
--- a/_test/alipay.php
+++ b/_test/alipay.php
@@ -17,7 +17,7 @@ return [
     'debug'       => true,
     // 应用ID
     'appid'       => '2016090900468879',
-    // 支付宝公钥(1行填写)
+    // 支付宝公钥(1行填写，特别注意，这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制)
     '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=',

From 401042c4f1a08ea604c63a7edc6c30f27aea340e Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 25 Dec 2018 10:15:33 +0800
Subject: [PATCH 138/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0R?=
 =?UTF-8?q?SA=E7=AD=BE=E5=90=8D=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicAliPay.php | 18 ++++++++++++++----
 _test/alipay.php                 |  2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index cce79b9..878b696 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -74,7 +74,7 @@ abstract class BasicAliPay
             'charset'   => empty($options['charset']) ? 'utf-8' : $options['charset'],
             'format'    => 'JSON',
             'version'   => '1.0',
-            'sign_type' => 'RSA2',
+            'sign_type' => empty($options['sign_type']) ? 'RSA2' : $options['sign_type'],
             'timestamp' => date('Y-m-d H:i:s'),
         ]);
         if (isset($options['notify_url']) && $options['notify_url'] !== '') {
@@ -162,8 +162,14 @@ abstract class BasicAliPay
     {
         $content = wordwrap($this->config->get('public_key'), 64, "\n", true);
         $res = "-----BEGIN PUBLIC KEY-----\n{$content}\n-----END PUBLIC KEY-----";
-        if (openssl_verify(json_encode($data, 256), base64_decode($sign), $res, OPENSSL_ALGO_SHA256) !== 1) {
-            throw new InvalidResponseException('Data signature verification failed.');
+        if ($this->options->get('sign_type') === 'RSA2') {
+            if (openssl_verify(json_encode($data, 256), base64_decode($sign), $res, OPENSSL_ALGO_SHA256) !== 1) {
+                throw new InvalidResponseException('Data signature verification failed.');
+            }
+        } else {
+            if (openssl_verify(json_encode($data, 256), base64_decode($sign), $res, OPENSSL_ALGO_SHA1) !== 1) {
+                throw new InvalidResponseException('Data signature verification failed.');
+            }
         }
         return $data;
     }
@@ -176,7 +182,11 @@ abstract class BasicAliPay
     {
         $content = wordwrap($this->config->get('private_key'), 64, "\n", true);
         $string = "-----BEGIN RSA PRIVATE KEY-----\n{$content}\n-----END RSA PRIVATE KEY-----";
-        openssl_sign($this->getSignContent($this->options->get(), true), $sign, $string, OPENSSL_ALGO_SHA256);
+        if ($this->options->get('sign_type') === 'RSA2') {
+            openssl_sign($this->getSignContent($this->options->get(), true), $sign, $string, OPENSSL_ALGO_SHA256);
+        } else {
+            openssl_sign($this->getSignContent($this->options->get(), true), $sign, $string, OPENSSL_ALGO_SHA1);
+        }
         return base64_encode($sign);
     }
 
diff --git a/_test/alipay.php b/_test/alipay.php
index 818498f..25a7379 100644
--- a/_test/alipay.php
+++ b/_test/alipay.php
@@ -15,6 +15,8 @@
 return [
     // 沙箱模式
     'debug'       => true,
+    // 签名类型（RSA|RSA2）
+    'sign_type'   => "RSA2",
     // 应用ID
     'appid'       => '2016090900468879',
     // 支付宝公钥(1行填写，特别注意，这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制)

From 79126e15bae72761cae50a73f2321acc83ec827f Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 7 Jan 2019 14:53:11 +0800
Subject: [PATCH 139/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1jssdk=E6=8E=88=E6=9D=83=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WeChat/Script.php b/WeChat/Script.php
index 49d040c..145e519 100644
--- a/WeChat/Script.php
+++ b/WeChat/Script.php
@@ -87,7 +87,7 @@ class Script extends BasicWeChat
             "timestamp" => $data['timestamp'],
             "signature" => $this->getSignature($data, 'sha1'),
             'jsApiList' => [
-                'updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareWeibo', 'onMenuShareQZone',
+                'updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone',
                 'startRecord', 'stopRecord', 'onVoiceRecordEnd', 'playVoice', 'pauseVoice', 'stopVoice', 'onVoicePlayEnd', 'uploadVoice', 'downloadVoice',
                 'chooseImage', 'previewImage', 'uploadImage', 'downloadImage', 'translateVoice', 'getNetworkType', 'openLocation', 'getLocation',
                 'hideOptionMenu', 'showOptionMenu', 'hideMenuItems', 'showMenuItems', 'hideAllNonBaseMenuItem', 'showAllNonBaseMenuItem',

From def818b7df403c7a00a5070a722e531161f68835 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 12 Jan 2019 19:40:04 +0800
Subject: [PATCH 140/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/Bill.php                  | 1 +
 AliPay/Pos.php                   | 1 +
 AliPay/Scan.php                  | 1 +
 AliPay/Transfer.php              | 1 +
 WeChat/Contracts/BasicAliPay.php | 4 +++-
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/AliPay/Bill.php b/AliPay/Bill.php
index 4717197..995e906 100644
--- a/AliPay/Bill.php
+++ b/AliPay/Bill.php
@@ -38,6 +38,7 @@ class Bill extends BasicAliPay
      * @param array $options
      * @return mixed
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function apply($options)
     {
diff --git a/AliPay/Pos.php b/AliPay/Pos.php
index b173082..800104e 100644
--- a/AliPay/Pos.php
+++ b/AliPay/Pos.php
@@ -39,6 +39,7 @@ class Pos extends BasicAliPay
      * @param array $options
      * @return mixed
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function apply($options)
     {
diff --git a/AliPay/Scan.php b/AliPay/Scan.php
index b86afc1..df9973c 100644
--- a/AliPay/Scan.php
+++ b/AliPay/Scan.php
@@ -38,6 +38,7 @@ class Scan extends BasicAliPay
      * @param array $options
      * @return mixed
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function apply($options)
     {
diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
index 001eaca..bb745cf 100644
--- a/AliPay/Transfer.php
+++ b/AliPay/Transfer.php
@@ -39,6 +39,7 @@ class Transfer extends BasicAliPay
      * @param array $options
      * @return mixed
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function apply($options)
     {
diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 878b696..ec2b6ef 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -238,7 +238,9 @@ abstract class BasicAliPay
                 $data[$method]['code'], $data
             );
         }
-        return $this->verify($data[$method], $data['sign']);
+        return $data[$method];
+        // 去除返回结果签名检查
+        // return $this->verify($data[$method], $data['sign']);
     }
 
     /**

From 5938b344f4857f516caf09b4af4ff1621dd70add Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 14 Jan 2019 14:04:41 +0800
Subject: [PATCH 141/161] Update We.php

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

diff --git a/We.php b/We.php
index 0705676..22d8370 100644
--- a/We.php
+++ b/We.php
@@ -74,7 +74,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.5';
+    const VERSION = '1.2.9';
 
     /**
      * 静态配置
@@ -111,8 +111,6 @@ class We
             $class = 'WeChat\\' . substr($name, 6);
         } elseif (substr($name, 0, 6) === 'WeMini') {
             $class = 'WeMini\\' . substr($name, 6);
-        } elseif (substr($name, 0, 5) === 'WePay') {
-            $class = 'WePay\\' . substr($name, 5);
         } elseif (substr($name, 0, 6) === 'AliPay') {
             $class = 'AliPay\\' . substr($name, 6);
         }

From 3846f79b6d224bceb65d4ab331e0bdecdfa2702c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 14 Jan 2019 14:05:41 +0800
Subject: [PATCH 142/161] Update We.php

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

diff --git a/We.php b/We.php
index 22d8370..919e35f 100644
--- a/We.php
+++ b/We.php
@@ -113,6 +113,8 @@ class We
             $class = 'WeMini\\' . substr($name, 6);
         } elseif (substr($name, 0, 6) === 'AliPay') {
             $class = 'AliPay\\' . substr($name, 6);
+        } elseif (substr($name, 0, 5) === 'WePay') {
+            $class = 'WePay\\' . substr($name, 5);
         }
         if (!empty($class) && class_exists($class)) {
             $option = array_shift($arguments);

From 06ee3506a8f513c748dd986029508f9dea7e281a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 18 Feb 2019 15:47:07 +0800
Subject: [PATCH 143/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8E=A5=E6=94=B6=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/Tools.php | 4 ++--
 composer.json              | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index b919e5c..fda7e90 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -150,7 +150,7 @@ class Tools
         $entity = libxml_disable_entity_loader(true);
         $data = (array)simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA);
         libxml_disable_entity_loader($entity);
-        return json_decode(self::arr2json($data), true);
+        return json_decode(json_encode($data), true);
     }
 
     /**
@@ -162,7 +162,7 @@ class Tools
     {
         return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', function ($matches) {
             return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");
-        }, ($jsonData = json_encode($data)) == '[]' ? '{}' : $jsonData);
+        }, ($json = json_encode($data)) == '[]' ? '{}' : $json);
     }
 
     /**
diff --git a/composer.json b/composer.json
index 0e8cfa4..d8ee7c1 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,10 @@
     "php": ">=5.4",
     "ext-json": "*",
     "ext-curl": "*",
-    "ext-openssl": "*"
+    "ext-libxml": "*",
+    "ext-openssl": "*",
+    "ext-mbstring": "*",
+    "ext-simplexml": "*"
   },
   "autoload": {
     "classmap": [

From 5032d020692e2e50519424563ff9bec868d693e1 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 25 Feb 2019 10:15:38 +0800
Subject: [PATCH 144/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=BA=A2=E5=8C=85=E5=8F=91=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/pay-redpack-create.php | 51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 _test/pay-redpack-create.php

diff --git a/_test/pay-redpack-create.php b/_test/pay-redpack-create.php
new file mode 100644
index 0000000..c2dab54
--- /dev/null
+++ b/_test/pay-redpack-create.php
@@ -0,0 +1,51 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+try {
+
+    // 1. 手动加载入口文件
+    include "../include.php";
+
+    // 2. 准备公众号配置参数
+    $config = include "./config.php";
+
+    // 3. 创建接口实例
+    $wechat = new \WePay\Redpack($config);
+
+    // 4. 组装参数，可以参考官方商户文档
+    $options = [
+        'mch_billno'   => time(),
+        're_openid'    => 'o38gps3vNdCqaggFfrBRCRikwlWY',
+        'send_name'    => '商户名称',
+        'act_name'     => '活动名称',
+        'total_amount' => '100',
+        'total_num'    => '1',
+        'wishing'      => '感谢您参加猜灯谜活动，祝您元宵节快乐！',
+        'remark'       => '猜越多得越多，快来抢！',
+        'client_ip'    => '127.0.0.1',
+    ];
+    // 发送红包记录
+    $result = $wechat->create($options);
+    echo '<pre>';
+    var_export($result);
+    // 查询红包记录
+    $result = $wechat->query($options['mch_billno']);
+    var_export($result);
+
+} catch (Exception $e) {
+
+    // 出错啦，处理下吧
+    echo $e->getMessage() . PHP_EOL;
+
+}
\ No newline at end of file

From 103488a1cd7341234e36f096c8595383e69327b3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 27 Mar 2019 15:01:49 +0800
Subject: [PATCH 145/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]Emoji=E8=A1=A8?=
 =?UTF-8?q?=E6=83=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/Tools.php | 67 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index fda7e90..d0de000 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -160,9 +160,70 @@ class Tools
      */
     public static function arr2json($data)
     {
-        return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', function ($matches) {
-            return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");
-        }, ($json = json_encode($data)) == '[]' ? '{}' : $json);
+        $json = json_encode(self::buildEnEmojiData($data), JSON_UNESCAPED_UNICODE);
+        return $json === '[]' ? '{}' : $json;
+    }
+
+    /**
+     * 数组对象Emoji编译处理
+     * @param array $data
+     * @return array
+     */
+    public static function buildEnEmojiData(array $data)
+    {
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $data[$key] = self::buildEnEmojiData($value);
+            } elseif (is_string($value)) {
+                $data[$key] = self::emojiEncode($value);
+            } else {
+                $data[$key] = $value;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * 数组对象Emoji反解析处理
+     * @param array $data
+     * @return array
+     */
+    public static function buildDeEmojiData(array $data)
+    {
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $data[$key] = self::buildDeEmojiData($value);
+            } elseif (is_string($value)) {
+                $data[$key] = self::emojiDecode($value);
+            } else {
+                $data[$key] = $value;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Emoji原形转换为String
+     * @param string $content
+     * @return string
+     */
+    public static function emojiEncode($content)
+    {
+        return json_decode(preg_replace_callback("/(\\\u[ed][0-9a-f]{3})/i", function ($string) {
+            return addslashes($string[0]);
+        }, json_encode($content)));
+    }
+
+    /**
+     * Emoji字符串转换为原形
+     * @param string $content
+     * @return string
+     */
+    public static function emojiDecode($content)
+    {
+        return json_decode(preg_replace_callback('/\\\\\\\\/i', function () {
+            return '\\';
+        }, json_encode($content)));
     }
 
     /**

From f68a378fc931f434b8e4044c5539bb24ed85038c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 30 Mar 2019 15:30:45 +0800
Subject: [PATCH 146/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeMini/Qrcode.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index a271712..7bc351e 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -32,16 +32,17 @@ class Qrcode extends BasicWeChat
      * @param integer $width 二维码的宽度
      * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
      * @param array $line_color auto_color 为 false 时生效
+     * @param boolean $is_hyaline 是否需要透明底色
      * @param null|string $outType 输出类型
      * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $outType = null)
+    public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $is_hyaline = true, $outType = null)
     {
         $url = 'https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
-        $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color];
+        $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
         $result = Tools::post($url, Tools::arr2json($data));
         if (json_decode($result)) {
             return Tools::json2arr($result);
@@ -57,15 +58,16 @@ class Qrcode extends BasicWeChat
      * @param integer $width 二维码的宽度
      * @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
      * @param array $line_color auto_color 为 false 时生效
+     * @param boolean $is_hyaline 是否需要透明底色
      * @param null|string $outType 输出类型
      * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $outType = null)
+    public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $is_hyaline = true, $outType = null)
     {
         $url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN';
-        $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color];
+        $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json($data));
         if (json_decode($result)) {

From 543d4a84dcf966fccb8b21bd2023ccbab913d18a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 4 Apr 2019 13:20:54 +0800
Subject: [PATCH 147/161] Update readme.md

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

diff --git a/readme.md b/readme.md
index 636d4cf..85b813b 100644
--- a/readme.md
+++ b/readme.md
@@ -30,7 +30,7 @@ WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先
 * 商户支付文档：https://pay.weixin.qq.com/wiki/doc/api/index.html
 
 针对 WeChatDeveloper 也有一准备了帮助资料可供参考。
-* ThinkAdmin：https://github.com/zoujingli/Think.Admin
+* ThinkAdmin：https://github.com/zoujingli/ThinkAdmin
 * WeChatDeveloper：https://www.kancloud.cn/zoujingli/wechat-developer
 
 

From f204629dc5e1c84ccd9923ff2f3e0dcbbdb2a8df Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 9 Apr 2019 11:10:57 +0800
Subject: [PATCH 148/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E6=B7=BB=E5=8A=A0E?=
 =?UTF-8?q?moji=E8=A1=A8=E6=83=85=E6=94=AF=E6=8C=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/pay-redpack-create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_test/pay-redpack-create.php b/_test/pay-redpack-create.php
index c2dab54..3df5fb6 100644
--- a/_test/pay-redpack-create.php
+++ b/_test/pay-redpack-create.php
@@ -27,7 +27,7 @@ try {
     $options = [
         'mch_billno'   => time(),
         're_openid'    => 'o38gps3vNdCqaggFfrBRCRikwlWY',
-        'send_name'    => '商户名称',
+        'send_name'    => '商户名称😍',
         'act_name'     => '活动名称',
         'total_amount' => '100',
         'total_num'    => '1',

From 83506ac24c78ac6fc7c4e3ac970b9caffd97dd35 Mon Sep 17 00:00:00 2001
From: Rootrl <danhoo@163.com>
Date: Wed, 10 Apr 2019 15:26:04 +0800
Subject: [PATCH 149/161] Modify  first result_code to return_code

---
 _test/pay-order-notify.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_test/pay-order-notify.php b/_test/pay-order-notify.php
index 3597f02..7b8267a 100644
--- a/_test/pay-order-notify.php
+++ b/_test/pay-order-notify.php
@@ -25,7 +25,7 @@ try {
 
     // 4. 获取通知参数
     $data = $wechat->getNotify();
-    if ($data['result_code'] === 'SUCCESS' && $data['result_code'] === 'SUCCESS') {
+    if ($data['return_code'] === 'SUCCESS' && $data['result_code'] === 'SUCCESS') {
         // @todo 去更新下原订单的支付状态
         $order_no = $data['out_trade_no'];
 
@@ -39,4 +39,4 @@ try {
     // 出错啦，处理下吧
     echo $e->getMessage() . PHP_EOL;
 
-}
\ No newline at end of file
+}

From 29b1d1f3731368d5fa9aafb8f93de996686d45ee Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 23 Apr 2019 15:52:21 +0800
Subject: [PATCH 150/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=96=87=E4=BB=B6=E5=86=99=E5=85=A5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/Tools.php | 26 +++++++++++++++++++++++++-
 _test/config.php           | 16 ++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php
index d0de000..60a435d 100644
--- a/WeChat/Contracts/Tools.php
+++ b/WeChat/Contracts/Tools.php
@@ -31,6 +31,17 @@ class Tools
      */
     public static $cache_path = null;
 
+    /**
+     * 缓存写入操作
+     * @var array
+     */
+    public static $cache_callable = [
+        'set' => null, // 写入缓存
+        'get' => null, // 获取缓存
+        'del' => null, // 删除缓存
+        'put' => null, // 写入文件
+    ];
+
     /**
      * 网络缓存
      * @var array
@@ -356,6 +367,9 @@ class Tools
      */
     public static function pushFile($name, $content)
     {
+        if (is_callable(self::$cache_callable['put'])) {
+            return call_user_func_array(self::$cache_callable['put'], func_get_args());
+        }
         $file = self::_getCacheName($name);
         if (!file_put_contents($file, $content)) {
             throw new LocalCacheException('local file write error.', '0');
@@ -373,8 +387,12 @@ class Tools
      */
     public static function setCache($name, $value = '', $expired = 3600)
     {
+        if (is_callable(self::$cache_callable['set'])) {
+            return call_user_func_array(self::$cache_callable['set'], func_get_args());
+        }
         $file = self::_getCacheName($name);
-        if (!file_put_contents($file, serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]))) {
+        $data = ['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)];
+        if (!file_put_contents($file, serialize($data))) {
             throw new LocalCacheException('local cache error.', '0');
         }
         return $file;
@@ -387,6 +405,9 @@ class Tools
      */
     public static function getCache($name)
     {
+        if (is_callable(self::$cache_callable['get'])) {
+            return call_user_func_array(self::$cache_callable['get'], func_get_args());
+        }
         $file = self::_getCacheName($name);
         if (file_exists($file) && ($content = file_get_contents($file))) {
             $data = unserialize($content);
@@ -405,6 +426,9 @@ class Tools
      */
     public static function delCache($name)
     {
+        if (is_callable(self::$cache_callable['del'])) {
+            return call_user_func_array(self::$cache_callable['del'], func_get_args());
+        }
         $file = self::_getCacheName($name);
         return file_exists($file) ? unlink($file) : true;
     }
diff --git a/_test/config.php b/_test/config.php
index 010618c..e6f8075 100644
--- a/_test/config.php
+++ b/_test/config.php
@@ -12,6 +12,22 @@
 // | github开源项目：https://github.com/zoujingli/WeChatDeveloper
 // +----------------------------------------------------------------------
 
+// 配置缓存处理函数
+//\WeChat\Contracts\Tools::$cache_callable = [
+//    'set' => function ($name, $value, $expired = 360) {
+//        var_dump(func_get_args());
+//    },
+//    'get' => function ($name) {
+//        var_dump(func_get_args());
+//    },
+//    'del' => function ($name) {
+//        var_dump(func_get_args());
+//    },
+//    'put' => function ($name) {
+//        var_dump(func_get_args());
+//    },
+//];
+
 return [
     'token'          => 'test',
     'appid'          => 'wx60a43dd8161666d4',

From d6b86979acf1fbd7227f46535bb0750350336984 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 23 Apr 2019 16:02:06 +0800
Subject: [PATCH 151/161] Update MyCurlFile.php

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

diff --git a/WeChat/Contracts/MyCurlFile.php b/WeChat/Contracts/MyCurlFile.php
index e81e3da..ff812ab 100644
--- a/WeChat/Contracts/MyCurlFile.php
+++ b/WeChat/Contracts/MyCurlFile.php
@@ -1,5 +1,17 @@
 <?php
 
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
 namespace WeChat\Contracts;
 
 /**

From 9464d20af40b24bc06fd146509ad003c17240116 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 16 May 2019 10:17:20 +0800
Subject: [PATCH 152/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BA=8C=E8=BF=9B=E5=88=B6=E8=B5=84=E6=BA=90=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                       |  3 ++-
 We.php                           |  2 +-
 WeChat/Contracts/BasicWeChat.php |  8 ++++----
 WeChat/Contracts/MyCurlFile.php  | 12 ------------
 WeChat/Custom.php                |  2 +-
 WeChat/Media.php                 | 12 ++++++++++--
 WeChat/Pay.php                   |  1 +
 WeMini/Qrcode.php                | 19 ++++++++++++++++---
 8 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3803ef2..7791a86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 /Cache
 /Test/cert
 /nbproject
-/composer.lock
\ No newline at end of file
+/composer.lock
+/_test/cert
\ No newline at end of file
diff --git a/We.php b/We.php
index 919e35f..a4ffc59 100644
--- a/We.php
+++ b/We.php
@@ -74,7 +74,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.9';
+    const VERSION = '1.2.12';
 
     /**
      * 静态配置
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index da8e2f8..0f9f8b8 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -40,19 +40,19 @@ class BasicWeChat
      * 当前请求方法参数
      * @var array
      */
-    private $currentMethod = [];
+    protected $currentMethod = [];
 
     /**
      * 当前模式
      * @var bool
      */
-    private $isTry = false;
+    protected $isTry = false;
 
     /**
      * 注册代替函数
      * @var string
      */
-    private $GetAccessTokenCallback;
+    protected $GetAccessTokenCallback;
 
     /**
      * BasicWeChat constructor.
@@ -128,7 +128,7 @@ class BasicWeChat
     }
 
     /**
-     * 清理删除accessToken
+     * 清理删除 AccessToken
      * @return bool
      */
     public function delAccessToken()
diff --git a/WeChat/Contracts/MyCurlFile.php b/WeChat/Contracts/MyCurlFile.php
index ff812ab..e81e3da 100644
--- a/WeChat/Contracts/MyCurlFile.php
+++ b/WeChat/Contracts/MyCurlFile.php
@@ -1,17 +1,5 @@
 <?php
 
-// +----------------------------------------------------------------------
-// | WeChatDeveloper
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://think.ctolog.com
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
-// +----------------------------------------------------------------------
-
 namespace WeChat\Contracts;
 
 /**
diff --git a/WeChat/Custom.php b/WeChat/Custom.php
index 12e5051..6d03091 100644
--- a/WeChat/Custom.php
+++ b/WeChat/Custom.php
@@ -79,7 +79,7 @@ class Custom extends BasicWeChat
      * @throws Exceptions\InvalidResponseException
      * @throws Exceptions\LocalCacheException
      */
-    public function inviteworker($kf_account, $invite_wx)
+    public function inviteWorker($kf_account, $invite_wx)
     {
         $url = 'https://api.weixin.qq.com/customservice/kfaccount/inviteworker?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
diff --git a/WeChat/Media.php b/WeChat/Media.php
index 33f9a69..8c7ca02 100644
--- a/WeChat/Media.php
+++ b/WeChat/Media.php
@@ -56,7 +56,11 @@ class Media extends BasicWeChat
         $url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id={$media_id}";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::get($url);
-        if (json_decode($result)) {
+        if (is_array($json = json_decode($result, true))) {
+            if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
+                [$this->delAccessToken(), $this->isTry = true];
+                return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
+            }
             return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
@@ -139,7 +143,11 @@ class Media extends BasicWeChat
         $url = "https://api.weixin.qq.com/cgi-bin/material/get_material?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, ['media_id' => $media_id]);
-        if (json_decode($result)) {
+        if (is_array($json = json_decode($result, true))) {
+            if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
+                [$this->delAccessToken(), $this->isTry = true];
+                return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
+            }
             return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 9045c00..dbbd4a1 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -160,6 +160,7 @@ class Pay extends BasicWePay
      * @param array $options 静音参数
      * @param null|string $outType 输出类型
      * @return bool|string
+     * @throws Exceptions\LocalCacheException
      * @throws InvalidResponseException
      */
     public function billDownload(array $options, $outType = null)
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index 7bc351e..fe31299 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -16,6 +16,7 @@ namespace WeMini;
 
 use WeChat\Contracts\BasicWeChat;
 use WeChat\Contracts\Tools;
+use WeChat\Exceptions\InvalidResponseException;
 
 /**
  * 微信小程序二维码管理
@@ -44,7 +45,11 @@ class Qrcode extends BasicWeChat
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
         $result = Tools::post($url, Tools::arr2json($data));
-        if (json_decode($result)) {
+        if (is_array($json = json_decode($result, true))) {
+            if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
+                [$this->delAccessToken(), $this->isTry = true];
+                return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
+            }
             return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
@@ -70,7 +75,11 @@ class Qrcode extends BasicWeChat
         $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json($data));
-        if (json_decode($result)) {
+        if (is_array($json = json_decode($result, true))) {
+            if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
+                [$this->delAccessToken(), $this->isTry = true];
+                return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
+            }
             return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
@@ -91,7 +100,11 @@ class Qrcode extends BasicWeChat
         $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width]));
-        if (json_decode($result)) {
+        if (is_array($json = json_decode($result, true))) {
+            if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
+                [$this->delAccessToken(), $this->isTry = true];
+                return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
+            }
             return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);

From d5722887cc808b0bfb023c08272df2215d7b4f95 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 8 Jul 2019 15:10:14 +0800
Subject: [PATCH 153/161] Update readme.md

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

diff --git a/readme.md b/readme.md
index 85b813b..529d1f4 100644
--- a/readme.md
+++ b/readme.md
@@ -262,6 +262,6 @@ try {
 
 赞助支持
 ----
-![赞助](http://zoujingli.oschina.io/static/pay.png)
+![赞助](http://static.thinkadmin.top/pay.png)
 
 

From 5719fa2dd6684234b13e9aff86093e26a3d0f6a1 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 11 Sep 2019 19:41:07 +0800
Subject: [PATCH 154/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeMini/Crypt.php     |  22 +++++
 WeMini/Delivery.php  | 209 +++++++++++++++++++++++++++++++++++++++++++
 WeMini/Img.php       |  72 +++++++++++++++
 WeMini/Logistics.php | 206 ++++++++++++++++++++++++++++++++++++++++++
 WeMini/Ocr.php       | 110 +++++++++++++++++++++++
 WeMini/Plugs.php     |  14 +++
 WeMini/Qrcode.php    |   3 +-
 WeMini/Security.php  |  70 +++++++++++++++
 WeMini/Soter.php     |  40 +++++++++
 WeMini/Template.php  |  16 ++++
 10 files changed, 760 insertions(+), 2 deletions(-)
 create mode 100644 WeMini/Delivery.php
 create mode 100644 WeMini/Img.php
 create mode 100644 WeMini/Logistics.php
 create mode 100644 WeMini/Ocr.php
 create mode 100644 WeMini/Security.php
 create mode 100644 WeMini/Soter.php

diff --git a/WeMini/Crypt.php b/WeMini/Crypt.php
index 70081ed..a458d7b 100644
--- a/WeMini/Crypt.php
+++ b/WeMini/Crypt.php
@@ -50,6 +50,7 @@ class Crypt extends BasicWeChat
      * 登录凭证校验
      * @param string $code 登录时获取的 code
      * @return array
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function session($code)
     {
@@ -67,6 +68,7 @@ class Crypt extends BasicWeChat
      * @return array
      * @throws InvalidDecryptException
      * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public function userInfo($code, $iv, $encryptedData)
     {
@@ -80,4 +82,24 @@ class Crypt extends BasicWeChat
         }
         return array_merge($result, $userinfo);
     }
+
+    /**
+     * 用户支付完成后，获取该用户的 UnionId
+     * @param string $openid 支付用户唯一标识
+     * @param null|string $transaction_id 微信支付订单号
+     * @param null|string $mch_id 微信支付分配的商户号，和商户订单号配合使用
+     * @param null|string $out_trade_no 微信支付商户订单号，和商户号配合使用
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getPaidUnionId($openid, $transaction_id = null, $mch_id = null, $out_trade_no = null)
+    {
+        $url = "https://api.weixin.qq.com/wxa/getpaidunionid?access_token=ACCESS_TOKEN&openid={$openid}";
+        if (is_null($mch_id)) $url .= "&mch_id={$mch_id}";
+        if (is_null($out_trade_no)) $url .= "&out_trade_no={$out_trade_no}";
+        if (is_null($transaction_id)) $url .= "&transaction_id={$transaction_id}";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callGetApi($url);
+    }
 }
\ No newline at end of file
diff --git a/WeMini/Delivery.php b/WeMini/Delivery.php
new file mode 100644
index 0000000..ce7bcb4
--- /dev/null
+++ b/WeMini/Delivery.php
@@ -0,0 +1,209 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 小程序退时配送
+ * Class Delivery
+ * @package WeMini
+ */
+class Delivery extends BasicWeChat
+{
+
+    /**
+     * 异常件退回商家商家确认收货接口
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function abnormalConfirm($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/order/confirm_return?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 addOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/order/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 addTip($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/order/addtips?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 cancelOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/order/cancel?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 getAllImmeDelivery($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/delivery/getall?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 getBindAccount($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/shop/get?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 getOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/order/get?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 mockUpdateOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/test_update_order?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 preAddOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/order/pre_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 preCancelOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/order/precancel?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 reOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/local/business/order/readd?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 动态消息，创建被分享动态消息的 activity_id
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function createActivityId($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?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 setUpdatableMsg($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/send?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/Img.php b/WeMini/Img.php
new file mode 100644
index 0000000..5fc01c2
--- /dev/null
+++ b/WeMini/Img.php
@@ -0,0 +1,72 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+use WeChat\Exceptions\InvalidResponseException;
+
+/**
+ * 小程序图像处理
+ * Class Img
+ * @package WeMini
+ */
+class Img extends BasicWeChat
+{
+
+    /**
+     * 本接口提供基于小程序的图片智能裁剪能力
+     * @param string $img_url 要检测的图片 url，传这个则不用传 img 参数。
+     * @param string $img form-data 中媒体文件标识，有filename、filelength、content-type等信息，传这个则不用穿 img_url
+     * @return array
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function aiCrop($img_url, $img)
+    {
+        $url = "https://api.weixin.qq.com/cv/img/aicrop?access_token=ACCESS_TOCKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['img_url' => $img_url, 'img' => $img], true);
+    }
+
+    /**
+     * 本接口提供基于小程序的条码/二维码识别的API
+     * @param string $img_url 要检测的图片 url，传这个则不用传 img 参数。
+     * @param string $img form-data 中媒体文件标识，有filename、filelength、content-type等信息，传这个则不用穿 img_url
+     * @return array
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function scanQRCode($img_url, $img)
+    {
+        $url = "https://api.weixin.qq.com/cv/img/qrcode?img_url=ENCODE_URL&access_token=ACCESS_TOCKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['img_url' => $img_url, 'img' => $img], true);
+    }
+
+    /**
+     * 本接口提供基于小程序的图片高清化能力
+     * @param string $img_url 要检测的图片 url，传这个则不用传 img 参数
+     * @param string $img form-data 中媒体文件标识，有filename、filelength、content-type等信息，传这个则不用穿 img_url
+     * @return array
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function superresolution($img_url, $img)
+    {
+        $url = "https://api.weixin.qq.com/cv/img/qrcode?img_url=ENCODE_URL&access_token=ACCESS_TOCKEN";
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['img_url' => $img_url, 'img' => $img], true);
+    }
+}
\ No newline at end of file
diff --git a/WeMini/Logistics.php b/WeMini/Logistics.php
new file mode 100644
index 0000000..dc048bb
--- /dev/null
+++ b/WeMini/Logistics.php
@@ -0,0 +1,206 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 小程序物流助手
+ * Class Logistics
+ * @package WeMini
+ */
+class Logistics extends BasicWeChat
+{
+    /**
+     * 生成运单
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function addOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/order/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 cancelOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/order/cancel?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 getAllDelivery()
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/delivery/getall?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callGetApi($url);
+    }
+
+    /**
+     * 获取运单数据
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/order/get?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 getPath($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/path/get?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 获取打印员。若需要使用微信打单 PC 软件，才需要调用
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getPrinter()
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/printer/getall?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callGetApi($url);
+    }
+
+    /**
+     * 获取电子面单余额。仅在使用加盟类快递公司时，才可以调用
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function getQuota($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/path/get?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 testUpdateOrder($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/test_update_order?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 配置面单打印员，若需要使用微信打单 PC 软件，才需要调用
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function updatePrinter($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/business/printer/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 getContact($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/delivery/contact/get?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 previewTemplate($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/delivery/template/preview?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 updateBusiness($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/delivery/service/business/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 updatePath($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/express/delivery/path/update?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/Ocr.php b/WeMini/Ocr.php
new file mode 100644
index 0000000..22b5048
--- /dev/null
+++ b/WeMini/Ocr.php
@@ -0,0 +1,110 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 小程序ORC服务
+ * Class Ocr
+ * @package WeMini
+ */
+class Ocr extends BasicWeChat
+{
+    /**
+     * 本接口提供基于小程序的银行卡 OCR 识别
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function bankcard($data)
+    {
+        $url = 'https://api.weixin.qq.com/cv/ocr/bankcard?access_token=ACCESS_TOCKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 本接口提供基于小程序的营业执照 OCR 识别
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function businessLicense($data)
+    {
+        $url = 'https://api.weixin.qq.com/cv/ocr/bizlicense?access_token=ACCESS_TOCKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 本接口提供基于小程序的驾驶证 OCR 识别
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function driverLicense($data)
+    {
+        $url = 'https://api.weixin.qq.com/cv/ocr/drivinglicense?access_token=ACCESS_TOCKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 本接口提供基于小程序的身份证 OCR 识别
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function idcard($data)
+    {
+        $url = 'https://api.weixin.qq.com/cv/ocr/idcard?access_token=ACCESS_TOCKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 本接口提供基于小程序的通用印刷体 OCR 识别
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function printedText($data)
+    {
+        $url = 'https://api.weixin.qq.com/cv/ocr/comm?access_token=ACCESS_TOCKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+    /**
+     * 本接口提供基于小程序的行驶证 OCR 识别
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function vehicleLicense($data)
+    {
+        $url = 'https://api.weixin.qq.com/cv/ocr/driving?access_token=ACCESS_TOCKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+}
\ No newline at end of file
diff --git a/WeMini/Plugs.php b/WeMini/Plugs.php
index 4755ff1..6110e89 100644
--- a/WeMini/Plugs.php
+++ b/WeMini/Plugs.php
@@ -64,6 +64,20 @@ class Plugs extends BasicWeChat
         return $this->callPostApi($url, ['action' => 'unbind', 'plugin_appid' => $plugin_appid], true);
     }
 
+    /**
+     * 获取当前所有插件使用方
+     * 修改插件使用申请的状态
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function devplugin($data)
+    {
+        $url = 'https://api.weixin.qq.com/wxa/devplugin?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
 
     /**
      * 4.获取当前所有插件使用方（供插件开发者调用）
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index fe31299..cacaf1f 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -16,7 +16,6 @@ namespace WeMini;
 
 use WeChat\Contracts\BasicWeChat;
 use WeChat\Contracts\Tools;
-use WeChat\Exceptions\InvalidResponseException;
 
 /**
  * 微信小程序二维码管理
@@ -109,5 +108,5 @@ class Qrcode extends BasicWeChat
         }
         return is_null($outType) ? $result : $outType($result);
     }
-
+    
 }
\ No newline at end of file
diff --git a/WeMini/Security.php b/WeMini/Security.php
new file mode 100644
index 0000000..5b1901f
--- /dev/null
+++ b/WeMini/Security.php
@@ -0,0 +1,70 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+use WeChat\Exceptions\InvalidResponseException;
+
+/**
+ * 小程序内容安全
+ * Class Security
+ * @package WeMini
+ */
+class Security extends BasicWeChat
+{
+
+    /**
+     * 校验一张图片是否含有违法违规内容
+     * @param string $media 要检测的图片文件，格式支持PNG、JPEG、JPG、GIF，图片尺寸不超过 750px x 1334px
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function imgSecCheck($media)
+    {
+        $url = 'https://api.weixin.qq.com/wxa/img_sec_check?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['media' => $media], true);
+    }
+
+    /**
+     * 异步校验图片/音频是否含有违法违规内容
+     * @param string $media_url
+     * @param string $media_type
+     * @return array
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function mediaCheckAsync($media_url, $media_type)
+    {
+        $url = 'https://api.weixin.qq.com/wxa/media_check_async?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['media_url' => $media_url, 'media_type' => $media_type], true);
+    }
+
+    /**
+     * 检查一段文本是否含有违法违规内容
+     * @param string $content
+     * @return array
+     * @throws InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function msgSecCheck($content)
+    {
+        $url = 'https://api.weixin.qq.com/wxa/msg_sec_check?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, ['content' => $content], true);
+    }
+}
\ No newline at end of file
diff --git a/WeMini/Soter.php b/WeMini/Soter.php
new file mode 100644
index 0000000..7890568
--- /dev/null
+++ b/WeMini/Soter.php
@@ -0,0 +1,40 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 小程序生物认证
+ * Class Soter
+ * @package WeMini
+ */
+class Soter extends BasicWeChat
+{
+    /**
+     * SOTER 生物认证秘钥签名验证
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function verifySignature($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/soter/verify_signature?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/Template.php b/WeMini/Template.php
index 516d407..730f8c3 100644
--- a/WeMini/Template.php
+++ b/WeMini/Template.php
@@ -107,4 +107,20 @@ class Template extends BasicWeChat
         return $this->callPostApi($url, $data, true);
     }
 
+    /**
+     * 下发小程序和公众号统一的服务消息
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function uniformSend($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->callPostApi($url, $data, true);
+    }
+
+
+
 }
\ No newline at end of file

From 67dcd1329e78bedf78db61a60c13a44f51e26b45 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 16 Sep 2019 13:17:35 +0800
Subject: [PATCH 155/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0=E6=9C=8D=E5=8A=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 We.php                          |  6 +++
 WeMini/Crypt.php                |  2 +-
 WeMini/Delivery.php             | 30 +--------------
 WeMini/{Img.php => Image.php}   |  4 +-
 WeMini/Message.php              | 67 +++++++++++++++++++++++++++++++++
 WeMini/Qrcode.php               |  2 +-
 WeMini/Template.php             | 16 --------
 WeMini/crypt/wxBizDataCrypt.php |  6 +--
 8 files changed, 80 insertions(+), 53 deletions(-)
 rename WeMini/{Img.php => Image.php} (98%)
 create mode 100644 WeMini/Message.php

diff --git a/We.php b/We.php
index a4ffc59..813cc16 100644
--- a/We.php
+++ b/We.php
@@ -44,9 +44,15 @@ use WeChat\Exceptions\InvalidInstanceException;
  *
  * ----- WeMini -----
  * @method \WeMini\Crypt WeMiniCrypt($options = []) static 小程序数据加密处理
+ * @method \WeMini\Delivery WeMiniDelivery($options = []) static 小程序即时配送
+ * @method \WeMini\Image WeMiniImage($options = []) static 小程序图像处理
+ * @method \WeMini\Logistics WeMiniLogistics($options = []) static 小程序物流助手
+ * @method \WeMini\Message WeMiniMessage($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\Security WeMiniSecurity($options = []) static 小程序内容安全
  * @method \WeMini\Template WeMiniTemplate($options = []) static 小程序模板消息支持
  * @method \WeMini\Total WeMiniTotal($options = []) static 小程序数据接口
  *
diff --git a/WeMini/Crypt.php b/WeMini/Crypt.php
index a458d7b..38fe360 100644
--- a/WeMini/Crypt.php
+++ b/WeMini/Crypt.php
@@ -78,7 +78,7 @@ class Crypt extends BasicWeChat
         }
         $userinfo = $this->decode($iv, $result['session_key'], $encryptedData);
         if (empty($userinfo)) {
-            throw  new InvalidDecryptException('用户信息解析失败', 403);
+            throw new InvalidDecryptException('用户信息解析失败', 403);
         }
         return array_merge($result, $userinfo);
     }
diff --git a/WeMini/Delivery.php b/WeMini/Delivery.php
index ce7bcb4..6d6d6af 100644
--- a/WeMini/Delivery.php
+++ b/WeMini/Delivery.php
@@ -17,7 +17,7 @@ namespace WeMini;
 use WeChat\Contracts\BasicWeChat;
 
 /**
- * 小程序退时配送
+ * 小程序即时配送
  * Class Delivery
  * @package WeMini
  */
@@ -178,32 +178,4 @@ class Delivery extends BasicWeChat
         return $this->callPostApi($url, $data, true);
     }
 
-    /**
-     * 动态消息，创建被分享动态消息的 activity_id
-     * @param array $data
-     * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
-     * @throws \WeChat\Exceptions\LocalCacheException
-     */
-    public function createActivityId($data)
-    {
-        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?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 setUpdatableMsg($data)
-    {
-        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/send?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/Img.php b/WeMini/Image.php
similarity index 98%
rename from WeMini/Img.php
rename to WeMini/Image.php
index 5fc01c2..16db575 100644
--- a/WeMini/Img.php
+++ b/WeMini/Image.php
@@ -19,10 +19,10 @@ use WeChat\Exceptions\InvalidResponseException;
 
 /**
  * 小程序图像处理
- * Class Img
+ * Class Image
  * @package WeMini
  */
-class Img extends BasicWeChat
+class Image extends BasicWeChat
 {
 
     /**
diff --git a/WeMini/Message.php b/WeMini/Message.php
new file mode 100644
index 0000000..fdb06a4
--- /dev/null
+++ b/WeMini/Message.php
@@ -0,0 +1,67 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | WeChatDeveloper
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://think.ctolog.com
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
+// +----------------------------------------------------------------------
+
+namespace WeMini;
+
+use WeChat\Contracts\BasicWeChat;
+
+/**
+ * 小程序动态消息
+ * Class Message
+ * @package WeMini
+ */
+class Message extends BasicWeChat
+{
+    /**
+     * 动态消息，创建被分享动态消息的 activity_id
+     * @param array $data
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function createActivityId($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?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 setUpdatableMsg($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/send?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 uniformSend($data)
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?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/Qrcode.php b/WeMini/Qrcode.php
index cacaf1f..4c238b3 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -108,5 +108,5 @@ class Qrcode extends BasicWeChat
         }
         return is_null($outType) ? $result : $outType($result);
     }
-    
+
 }
\ No newline at end of file
diff --git a/WeMini/Template.php b/WeMini/Template.php
index 730f8c3..516d407 100644
--- a/WeMini/Template.php
+++ b/WeMini/Template.php
@@ -107,20 +107,4 @@ class Template extends BasicWeChat
         return $this->callPostApi($url, $data, true);
     }
 
-    /**
-     * 下发小程序和公众号统一的服务消息
-     * @param array $data
-     * @return array
-     * @throws \WeChat\Exceptions\InvalidResponseException
-     * @throws \WeChat\Exceptions\LocalCacheException
-     */
-    public function uniformSend($data)
-    {
-        $url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?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/crypt/wxBizDataCrypt.php b/WeMini/crypt/wxBizDataCrypt.php
index 43769f2..d969638 100644
--- a/WeMini/crypt/wxBizDataCrypt.php
+++ b/WeMini/crypt/wxBizDataCrypt.php
@@ -1,12 +1,10 @@
 <?php
 
 /**
- * 对微信小程序用户加密数据的解密示例代码.
- *
+ * 对微信小程序用户加密数据的解密示例代码
+ * Class WXBizDataCrypt
  * @copyright Copyright (c) 1998-2014 Tencent Inc.
  */
-
-
 class WXBizDataCrypt
 {
     private $appid;

From 7c2dfd4c5f5080b29de0943a0bcb40bb69dd4bd5 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 16 Sep 2019 13:18:54 +0800
Subject: [PATCH 156/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0=E6=9C=8D=E5=8A=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/We.php b/We.php
index 813cc16..5653795 100644
--- a/We.php
+++ b/We.php
@@ -53,6 +53,7 @@ use WeChat\Exceptions\InvalidInstanceException;
  * @method \WeMini\Poi WeMiniPoi($options = []) static 小程序地址管理
  * @method \WeMini\Qrcode WeMiniQrcode($options = []) static 小程序二维码管理
  * @method \WeMini\Security WeMiniSecurity($options = []) static 小程序内容安全
+ * @method \WeMini\Soter WeMiniSoter($options = []) static 小程序生物认证
  * @method \WeMini\Template WeMiniTemplate($options = []) static 小程序模板消息支持
  * @method \WeMini\Total WeMiniTotal($options = []) static 小程序数据接口
  *

From 5789420f58eb4a506b6dca12bdcf094efd66f892 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 16 Sep 2019 13:20:21 +0800
Subject: [PATCH 157/161] Update We.php

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

diff --git a/We.php b/We.php
index 5653795..f4bb06b 100644
--- a/We.php
+++ b/We.php
@@ -81,7 +81,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.12';
+    const VERSION = '1.2.13';
 
     /**
      * 静态配置

From 5fdc20c4a4ed3276a780ab9c51bed733abff6929 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 29 Oct 2019 17:14:09 +0800
Subject: [PATCH 158/161] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E8=B5=84=E6=96=99=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=8C=87=E5=AE=9A=E8=AF=AD=E8=A8=80=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/WeChat/User.php b/WeChat/User.php
index c362ccd..2156cf7 100644
--- a/WeChat/User.php
+++ b/WeChat/User.php
@@ -49,7 +49,7 @@ class User extends BasicWeChat
      */
     public function getUserInfo($openid, $lang = 'zh_CN')
     {
-        $url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=ACCESS_TOKEN&openid={$openid}&lang=zh_CN";
+        $url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=ACCESS_TOKEN&openid={$openid}&lang={$lang}";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         return $this->httpGetForJson($url);
     }

From 63c2ef5e6887c0b5577a687ab9196f01c8479ab7 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 5 Nov 2019 10:21:02 +0800
Subject: [PATCH 159/161] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=A0=81=E6=94=AF=E4=BB=98=E5=8F=8A=E9=9D=99?=
 =?UTF-8?q?=E6=80=81=E5=AE=9E=E4=BE=8B=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

一、增加刷卡支付接口 #30
二、增加静态实例调用
---
 WeChat/Contracts/BasicAliPay.php   | 18 +++++++++
 WeChat/Contracts/BasicWeChat.php   | 18 +++++++++
 WeChat/Contracts/BasicWePay.php    | 17 +++++++++
 WeChat/Pay.php                     | 61 +++++++++++++-----------------
 WePay/Order.php                    | 13 +++++++
 _test/alipay-app.php               |  3 +-
 _test/alipay-bill.php              |  4 +-
 _test/alipay-notify.php            |  4 +-
 _test/alipay-pos.php               |  5 ++-
 _test/alipay-refund.php            |  5 ++-
 _test/alipay-scan.php              |  5 ++-
 _test/alipay-transfer.php          |  7 +++-
 _test/alipay-wap.php               |  5 ++-
 _test/alipay-web.php               |  5 ++-
 _test/mini-login.php               |  6 ++-
 _test/mini-qrc.php                 |  8 ++--
 _test/pay-download-bill.php        |  4 +-
 _test/pay-order-close.php          |  4 +-
 _test/pay-order-create.php         |  4 +-
 _test/pay-order-notify.php         |  4 +-
 _test/pay-order-query.php          |  4 +-
 _test/pay-redpack-create.php       |  4 +-
 _test/pay-refund-create.php        |  4 +-
 _test/pay-refund-query.php         |  4 +-
 _test/pay-transfers-create.php     |  4 +-
 _test/pay-transfersbank-create.php |  4 +-
 _test/wechat-jssdk-sign.php        |  4 +-
 _test/wechat-menu-get.php          |  6 ++-
 _test/wechat-qrcode-create.php     |  4 +-
 _test/wechat-user-get.php          |  4 +-
 30 files changed, 178 insertions(+), 64 deletions(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index ec2b6ef..732cac0 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -43,6 +43,12 @@ abstract class BasicAliPay
      */
     protected $params;
 
+    /**
+     * 静态缓存
+     * @var static
+     */
+    private static $cache;
+
     /**
      * 正常请求网关
      * @var string
@@ -88,6 +94,18 @@ abstract class BasicAliPay
         }
     }
 
+    /**
+     * 静态创建对象
+     * @param array $config
+     * @return static
+     */
+    public static function instance(array $config)
+    {
+        $key = md5(get_called_class() . serialize($config));
+        if (isset(self::$cache[$key])) return self::$cache[$key];
+        return self::$cache[$key] = new static($config);
+    }
+
     /**
      * 查询支付宝订单状态
      * @param string $out_trade_no
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 0f9f8b8..5d4a1c0 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -48,6 +48,12 @@ class BasicWeChat
      */
     protected $isTry = false;
 
+    /**
+     * 静态缓存
+     * @var static
+     */
+    private static $cache;
+
     /**
      * 注册代替函数
      * @var string
@@ -75,6 +81,18 @@ class BasicWeChat
         $this->config = new DataArray($options);
     }
 
+    /**
+     * 静态创建对象
+     * @param array $config
+     * @return static
+     */
+    public static function instance(array $config)
+    {
+        $key = md5(get_called_class() . serialize($config));
+        if (isset(self::$cache[$key])) return self::$cache[$key];
+        return self::$cache[$key] = new static($config);
+    }
+
     /**
      * 获取访问accessToken
      * @return string
diff --git a/WeChat/Contracts/BasicWePay.php b/WeChat/Contracts/BasicWePay.php
index 1f0f096..25b3f3b 100644
--- a/WeChat/Contracts/BasicWePay.php
+++ b/WeChat/Contracts/BasicWePay.php
@@ -36,6 +36,11 @@ class BasicWePay
      */
     protected $params;
 
+    /**
+     * 静态缓存
+     * @var static
+     */
+    private static $cache;
 
     /**
      * WeChat constructor.
@@ -71,6 +76,18 @@ class BasicWePay
         }
     }
 
+    /**
+     * 静态创建对象
+     * @param array $config
+     * @return static
+     */
+    public static function instance(array $config)
+    {
+        $key = md5(get_called_class() . serialize($config));
+        if (isset(self::$cache[$key])) return self::$cache[$key];
+        return self::$cache[$key] = new static($config);
+    }
+
     /**
      * 获取微信支付通知
      * @return array
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index dbbd4a1..3e3fbad 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -18,7 +18,6 @@ use WeChat\Contracts\BasicWePay;
 use WeChat\Exceptions\InvalidResponseException;
 use WePay\Bill;
 use WePay\Order;
-use WePay\Refund;
 use WePay\Transfers;
 use WePay\TransfersBank;
 
@@ -39,10 +38,20 @@ class Pay extends BasicWePay
      */
     public function createOrder(array $options)
     {
-        $pay = new Order($this->config->get());
-        return $pay->create($options);
+        return Order::instance($this->config->get())->create($options);
     }
 
+    /**
+     * 刷卡支付
+     * @param array $options
+     * @return array
+     * @throws Exceptions\LocalCacheException
+     * @throws InvalidResponseException
+     */
+    public function createMicropay($options)
+    {
+        return Order::instance($this->config->get())->micropay($options);
+    }
 
     /**
      * 创建JsApi及H5支付参数
@@ -51,8 +60,7 @@ class Pay extends BasicWePay
      */
     public function createParamsForJsApi($prepay_id)
     {
-        $pay = new Order($this->config->get());
-        return $pay->jsapiParams($prepay_id);
+        return Order::instance($this->config->get())->jsapiParams($prepay_id);
     }
 
     /**
@@ -62,8 +70,7 @@ class Pay extends BasicWePay
      */
     public function createParamsForApp($prepay_id)
     {
-        $pay = new Order($this->config->get());
-        return $pay->appParams($prepay_id);
+        return Order::instance($this->config->get())->appParams($prepay_id);
     }
 
     /**
@@ -73,8 +80,7 @@ class Pay extends BasicWePay
      */
     public function createParamsForRuleQrc($product_id)
     {
-        $pay = new Order($this->config->get());
-        return $pay->qrcParams($product_id);
+        return Order::instance($this->config->get())->qrcParams($product_id);
     }
 
     /**
@@ -86,8 +92,7 @@ class Pay extends BasicWePay
      */
     public function queryOrder(array $options)
     {
-        $pay = new Order($this->config->get());
-        return $pay->query($options);
+        return Order::instance($this->config->get())->query($options);
     }
 
     /**
@@ -99,8 +104,7 @@ class Pay extends BasicWePay
      */
     public function closeOrder($out_trade_no)
     {
-        $pay = new Order($this->config->get());
-        return $pay->close($out_trade_no);
+        return Order::instance($this->config->get())->close($out_trade_no);
     }
 
     /**
@@ -112,8 +116,7 @@ class Pay extends BasicWePay
      */
     public function createRefund(array $options)
     {
-        $pay = new Refund($this->config->get());
-        return $pay->create($options);
+        return Order::instance($this->config->get())->create($options);
     }
 
     /**
@@ -125,8 +128,7 @@ class Pay extends BasicWePay
      */
     public function queryRefund(array $options)
     {
-        $pay = new Refund($this->config->get());
-        return $pay->query($options);
+        return Order::instance($this->config->get())->query($options);
     }
 
     /**
@@ -138,8 +140,7 @@ class Pay extends BasicWePay
      */
     public function report(array $options)
     {
-        $pay = new Order($this->config->get());
-        return $pay->report($options);
+        return Order::instance($this->config->get())->report($options);
     }
 
     /**
@@ -151,8 +152,7 @@ class Pay extends BasicWePay
      */
     public function queryAuthCode($authCode)
     {
-        $pay = new Order($this->config->get());
-        return $pay->queryAuthCode($authCode);
+        return Order::instance($this->config->get())->queryAuthCode($authCode);
     }
 
     /**
@@ -165,11 +165,9 @@ class Pay extends BasicWePay
      */
     public function billDownload(array $options, $outType = null)
     {
-        $pay = new Bill($this->config->get());
-        return $pay->download($options, $outType);
+        return Bill::instance($this->config->get())->download($options, $outType);
     }
 
-
     /**
      * 拉取订单评价数据
      * @param array $options
@@ -179,8 +177,7 @@ class Pay extends BasicWePay
      */
     public function billCommtent(array $options)
     {
-        $pay = new Bill($this->config->get());
-        return $pay->comment($options);
+        return Bill::instance($this->config->get())->comment($options);
     }
 
     /**
@@ -192,8 +189,7 @@ class Pay extends BasicWePay
      */
     public function createTransfers(array $options)
     {
-        $pay = new Transfers($this->config->get());
-        return $pay->create($options);
+        return Transfers::instance($this->config->get())->create($options);
     }
 
     /**
@@ -205,8 +201,7 @@ class Pay extends BasicWePay
      */
     public function queryTransfers($partner_trade_no)
     {
-        $pay = new Transfers($this->config->get());
-        return $pay->query($partner_trade_no);
+        return Transfers::instance($this->config->get())->query($partner_trade_no);
     }
 
     /**
@@ -219,8 +214,7 @@ class Pay extends BasicWePay
      */
     public function createTransfersBank(array $options)
     {
-        $pay = new TransfersBank($this->config->get());
-        return $pay->create($options);
+        return TransfersBank::instance($this->config->get())->create($options);
     }
 
     /**
@@ -232,7 +226,6 @@ class Pay extends BasicWePay
      */
     public function queryTransFresBank($partner_trade_no)
     {
-        $pay = new TransfersBank($this->config->get());
-        return $pay->query($partner_trade_no);
+        return TransfersBank::instance($this->config->get())->query($partner_trade_no);
     }
 }
\ No newline at end of file
diff --git a/WePay/Order.php b/WePay/Order.php
index 2b4a1f5..1d93288 100644
--- a/WePay/Order.php
+++ b/WePay/Order.php
@@ -38,6 +38,19 @@ class Order extends BasicWePay
         return $this->callPostApi($url, $options, false, 'MD5');
     }
 
+    /**
+     * 刷卡支付
+     * @param array $options
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function micropay(array $options)
+    {
+        $url = 'https://api.mch.weixin.qq.com/pay/micropay';
+        return $this->callPostApi($url, $options, false, 'MD5');
+    }
+
     /**
      * 查询订单
      * @param array $options
diff --git a/_test/alipay-app.php b/_test/alipay-app.php
index bbfe18e..0070eb3 100644
--- a/_test/alipay-app.php
+++ b/_test/alipay-app.php
@@ -20,8 +20,9 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = \We::AliPayApp($config);
+    // $pay = \We::AliPayApp($config);
     // $pay = new \AliPay\App($config);
+    $pay = \AliPay\App::instance($config);
 
     // 请参考（请求参数）：https://docs.open.alipay.com/api_1/alipay.trade.app.pay
     $result = $pay->apply([
diff --git a/_test/alipay-bill.php b/_test/alipay-bill.php
index 3ed1109..af5c493 100644
--- a/_test/alipay-bill.php
+++ b/_test/alipay-bill.php
@@ -20,8 +20,10 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = \We::AliPayBill($config);
     // $pay = new \AliPay\Bill($config);
+    // $pay = \We::AliPayBill($config);
+    $pay = \AliPay\Bill::instance($config);
+
     // 请参考（请求参数）：https://docs.open.alipay.com/api_15/alipay.data.dataservice.bill.downloadurl.query
     $result = $pay->apply([
         'bill_date' => '2018-10-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
diff --git a/_test/alipay-notify.php b/_test/alipay-notify.php
index 311cb6a..0d59116 100644
--- a/_test/alipay-notify.php
+++ b/_test/alipay-notify.php
@@ -20,8 +20,10 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = \We::AliPayApp($config);
+    // $pay = \We::AliPayApp($config);
     // $pay = new \AliPay\App($config);
+    $pay = \AliPay\App::instance($config);
+
     $data = $pay->notify();
     if (in_array($data['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED'])) {
         // @todo 更新订单状态，支付完成
diff --git a/_test/alipay-pos.php b/_test/alipay-pos.php
index 4900374..e55c4e2 100644
--- a/_test/alipay-pos.php
+++ b/_test/alipay-pos.php
@@ -20,8 +20,10 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = We::AliPayPos($config);
+    // $pay = We::AliPayPos($config);
     // $pay = new \AliPay\Pos($config);
+    $pay = \AliPay\Pos::instance($config);
+
     // 参数链接：https://docs.open.alipay.com/api_1/alipay.trade.pay
     $result = $pay->apply([
         'out_trade_no' => '4312412343', // 订单号
@@ -29,6 +31,7 @@ try {
         'subject'      => '订单商品标题', // 订单商品标题
         'auth_code'    => '123456', // 授权码
     ]);
+
     echo '<pre>';
     var_export($result);
 } catch (Exception $e) {
diff --git a/_test/alipay-refund.php b/_test/alipay-refund.php
index 57fb0bf..487ca7b 100644
--- a/_test/alipay-refund.php
+++ b/_test/alipay-refund.php
@@ -25,10 +25,13 @@ $refund_fee = '1.00';
 
 try {
     // 实例支付对象
-    $pay = We::AliPayApp($config);
+    // $pay = We::AliPayApp($config);
     // $pay = new \AliPay\App($config);
+    $pay = \AliPay\App::instance($config);
+
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.refund
     $result = $pay->refund($out_trade_no, $refund_fee);
+    
     echo '<pre>';
     var_export($result);
 } catch (Exception $e) {
diff --git a/_test/alipay-scan.php b/_test/alipay-scan.php
index 0a11076..2bc8806 100644
--- a/_test/alipay-scan.php
+++ b/_test/alipay-scan.php
@@ -20,14 +20,17 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = We::AliPayScan($config);
+    // $pay = We::AliPayScan($config);
     // $pay = new \AliPay\Scan($config);
+    $pay = \AliPay\Scan::instance($config);
+
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.precreate
     $result = $pay->apply([
         'out_trade_no' => '14321412', // 订单号
         'total_amount' => '13', // 订单金额，单位：元
         'subject'      => '订单商品标题', // 订单商品标题
     ]);
+
     echo '<pre>';
     var_export($result);
 } catch (Exception $e) {
diff --git a/_test/alipay-transfer.php b/_test/alipay-transfer.php
index 16b56aa..4eaf6fb 100644
--- a/_test/alipay-transfer.php
+++ b/_test/alipay-transfer.php
@@ -20,8 +20,10 @@ $config = include "./alipay.php";
 
 try {
     // 实例支付对象
-    $pay = We::AliPayTransfer($config);
-    // $pay = new \AliPay\Scan($config);
+    // $pay = We::AliPayTransfer($config);
+    // $pay = new \AliPay\Transfer($config);
+    $pay = \AliPay\Transfer::instance($config);
+
     // 参考链接：https://docs.open.alipay.com/api_28/alipay.fund.trans.toaccount.transfer
     $result = $pay->apply([
         'out_biz_no'      => time(), // 订单号
@@ -32,6 +34,7 @@ try {
         'payee_real_name' => '张三', // 收款方真实姓名
         'remark'          => '张三', // 转账备注
     ]);
+
     echo '<pre>';
     var_export($result);
 } catch (Exception $e) {
diff --git a/_test/alipay-wap.php b/_test/alipay-wap.php
index 3b63833..ac04021 100644
--- a/_test/alipay-wap.php
+++ b/_test/alipay-wap.php
@@ -23,14 +23,17 @@ $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
 
 try {
     // 实例支付对象
-    $pay = We::AliPayWap($config);
+    // $pay = We::AliPayWap($config);
     // $pay = new \AliPay\Wap($config);
+    $pay = \AliPay\Wap::instance($config);
+
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.wap.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
         'total_amount' => '1', // 支付金额
         'subject'      => '支付订单描述', // 支付订单描述
     ]);
+
     echo $result;
 } catch (Exception $e) {
     echo $e->getMessage();
diff --git a/_test/alipay-web.php b/_test/alipay-web.php
index e0e3b86..46f0efc 100644
--- a/_test/alipay-web.php
+++ b/_test/alipay-web.php
@@ -24,14 +24,17 @@ $config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
 
 try {
     // 实例支付对象
-    $pay = We::AliPayWeb($config);
+    // $pay = We::AliPayWeb($config);
     // $pay = new \AliPay\Web($config);
+    $pay = \AliPay\Web::instance($config);
+
     // 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.page.pay
     $result = $pay->apply([
         'out_trade_no' => time(), // 商户订单号
         'total_amount' => '1', // 支付金额
         'subject'      => '支付订单描述', // 支付订单描述
     ]);
+
     echo $result;
 } catch (Exception $e) {
     echo $e->getMessage();
diff --git a/_test/mini-login.php b/_test/mini-login.php
index 2f3bab3..c6f56ba 100644
--- a/_test/mini-login.php
+++ b/_test/mini-login.php
@@ -13,7 +13,11 @@ $iv = 'ltM/wT7hsAl0TijEBI4v/g==';
 $code = '013LyiTR0TwjC92QjJRR0mEsTR0LyiT3';
 $decode = 'eIoVtIC2YzLCnrwiIs1IBbXMvC0vyL8bo1IhD38fUQIRbk3lgTWa0Hdw/Ty7NTs3iu7YlqqZBti+cxd6dCfeXBUQwTO2QpbHg0WTeDAdrihsHRHm4dCWdfTx8rzDloGbNOIsKdRElIhUH5YFdiTr5AYiufUDb34cwJ4GNWLAUq4bR0dmFeVEi+3nfwe2MAjGYDl4aq719VLsHodOggK6lXZvM5wjoDyuZsK2dPqJr3/Ji30Z0mdyFq32R4uR3rtJH/h+Rj0+/QmE9QYG7Y6Z48hgPE8cpnhRQNwH49jnC/zKZ9wtDkQ/J8J3Ed2i58zcuY01v8IV+pZ8oBUKXfO5ha+APOxtBSTzyHraU/2RGo8UWtOF6h64OQZhd/UQQy362eyc/qoq8sF9JnEFRP0mRmTDJ+u9oyDhxswCu6x8V73ERWaJeEGSCyjiGpep7/DxZ6eSSBq36OB0BWBkJqsq9Q==';
 $sessionKey = 'OetNxl86B/yMpbwG6wtMEw==';
-$mini = new WeMini\Crypt($config);
+
+// $mini = \We::WeMiniCrypt($config);
+// $mini = new WeMini\Crypt($config);
+$mini = \WeMini\Crypt::instance($config);
+
 echo '<pre>';
 //print_r($mini->session($code));
 print_r($mini->decode($iv, $sessionKey, $decode));
diff --git a/_test/mini-qrc.php b/_test/mini-qrc.php
index ce62ae1..84ca9d6 100644
--- a/_test/mini-qrc.php
+++ b/_test/mini-qrc.php
@@ -10,13 +10,13 @@ $config = [
 
 //We::config($config);
 
-$mini = We::WeMiniQrcode($config);
-
-//$mini = new WeMini\Qrcode($config);
+// $mini = We::WeMiniQrcode($config);
+// $mini = new WeMini\Qrcode($config);
+$mini = \WeMini\Qrcode::instance($config);
 
 //echo '<pre>';
 try {
-    header('Content-type:image/jpeg');//输出的类型
+    header('Content-type:image/jpeg'); //输出的类型
 //    echo $mini->createDefault('pages/index?query=1');
 //    echo $mini->createMiniScene('432432', 'pages/index/index');
     echo $mini->createMiniPath('pages/index?query=1');
diff --git a/_test/pay-download-bill.php b/_test/pay-download-bill.php
index c0181fb..ffac45b 100644
--- a/_test/pay-download-bill.php
+++ b/_test/pay-download-bill.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-order-close.php b/_test/pay-order-close.php
index 3a31ddc..eeead4a 100644
--- a/_test/pay-order-close.php
+++ b/_test/pay-order-close.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = '1217752501201407033233368018';
diff --git a/_test/pay-order-create.php b/_test/pay-order-create.php
index e130bb1..e9c9f20 100644
--- a/_test/pay-order-create.php
+++ b/_test/pay-order-create.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-order-notify.php b/_test/pay-order-notify.php
index 7b8267a..7484aac 100644
--- a/_test/pay-order-notify.php
+++ b/_test/pay-order-notify.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 获取通知参数
     $data = $wechat->getNotify();
diff --git a/_test/pay-order-query.php b/_test/pay-order-query.php
index d993488..b7edf34 100644
--- a/_test/pay-order-query.php
+++ b/_test/pay-order-query.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-redpack-create.php b/_test/pay-redpack-create.php
index 3df5fb6..c45dade 100644
--- a/_test/pay-redpack-create.php
+++ b/_test/pay-redpack-create.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WePay\Redpack($config);
+    // $wechat = new \WePay\Redpack($config);
+    // $wechat = \We::WePayRedpack($config);
+    $wechat = \WePay\Redpack::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-refund-create.php b/_test/pay-refund-create.php
index 02b554b..8e3df01 100644
--- a/_test/pay-refund-create.php
+++ b/_test/pay-refund-create.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-refund-query.php b/_test/pay-refund-query.php
index a812ac4..fa63acc 100644
--- a/_test/pay-refund-query.php
+++ b/_test/pay-refund-query.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-transfers-create.php b/_test/pay-transfers-create.php
index 77d70b0..659d888 100644
--- a/_test/pay-transfers-create.php
+++ b/_test/pay-transfers-create.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/pay-transfersbank-create.php b/_test/pay-transfersbank-create.php
index 92147af..ca3979e 100644
--- a/_test/pay-transfersbank-create.php
+++ b/_test/pay-transfersbank-create.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Pay($config);
+    // $wechat = new \WeChat\Pay($config);
+    // $wechat = \We::WeChatPay($config);
+    $wechat = \WeChat\Pay::instance($config);
 
     // 4. 组装参数，可以参考官方商户文档
     $options = [
diff --git a/_test/wechat-jssdk-sign.php b/_test/wechat-jssdk-sign.php
index 8986cf2..6a3b698 100644
--- a/_test/wechat-jssdk-sign.php
+++ b/_test/wechat-jssdk-sign.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Script($config);
+    // $wechat = \We::WeChatScript($config);
+    // $wechat = new \WeChat\Script($config);
+    $wechat = \WeChat\Script::instance($config);
 
     // 4. 获取JSSDK网址签名配置
     $result = $wechat->getJsSign('http://a.com/test.php');
diff --git a/_test/wechat-menu-get.php b/_test/wechat-menu-get.php
index 31f18b0..5447aad 100644
--- a/_test/wechat-menu-get.php
+++ b/_test/wechat-menu-get.php
@@ -21,11 +21,13 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $menu = new \WeChat\Menu($config);
+    // $menu = \We::WeChatMenu($config);
+    // $menu = new \WeChat\Menu($config);
+    $menu = \WeChat\Menu::instance($config);
 
     // 4. 获取菜单数据
     $result = $menu->get();
-    
+
     var_export($result);
 
 } catch (Exception $e) {
diff --git a/_test/wechat-qrcode-create.php b/_test/wechat-qrcode-create.php
index e7daa79..256e30a 100644
--- a/_test/wechat-qrcode-create.php
+++ b/_test/wechat-qrcode-create.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\Qrcode($config);
+    // $wechat = \We::WeChatQrcode($config);
+    // $wechat = new \WeChat\Qrcode($config);
+    $wechat = \WeChat\Qrcode::instance($config);
 
     // 4. 获取用户列表
     $result = $wechat->create('场景内容');
diff --git a/_test/wechat-user-get.php b/_test/wechat-user-get.php
index ad94e3a..d42cb56 100644
--- a/_test/wechat-user-get.php
+++ b/_test/wechat-user-get.php
@@ -21,7 +21,9 @@ try {
     $config = include "./config.php";
 
     // 3. 创建接口实例
-    $wechat = new \WeChat\User($config);
+    // $wechat = \We::WeChatUser($config);
+    // $wechat = new \WeChat\User($config);
+    $wechat = \WeChat\User::instance($config);
 
     // 4. 获取用户列表
     $result = $wechat->getUserList();

From 39d53dd91040517a01d7c7423235f56b47deefa3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 5 Nov 2019 10:35:27 +0800
Subject: [PATCH 160/161] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicAliPay.php | 2 +-
 WeChat/Contracts/BasicWeChat.php | 2 +-
 WeChat/Contracts/BasicWePay.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 732cac0..b2d320a 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -47,7 +47,7 @@ abstract class BasicAliPay
      * 静态缓存
      * @var static
      */
-    private static $cache;
+    protected static $cache;
 
     /**
      * 正常请求网关
diff --git a/WeChat/Contracts/BasicWeChat.php b/WeChat/Contracts/BasicWeChat.php
index 5d4a1c0..81c3645 100644
--- a/WeChat/Contracts/BasicWeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -52,7 +52,7 @@ class BasicWeChat
      * 静态缓存
      * @var static
      */
-    private static $cache;
+    protected static $cache;
 
     /**
      * 注册代替函数
diff --git a/WeChat/Contracts/BasicWePay.php b/WeChat/Contracts/BasicWePay.php
index 25b3f3b..55a7080 100644
--- a/WeChat/Contracts/BasicWePay.php
+++ b/WeChat/Contracts/BasicWePay.php
@@ -40,7 +40,7 @@ class BasicWePay
      * 静态缓存
      * @var static
      */
-    private static $cache;
+    protected static $cache;
 
     /**
      * WeChat constructor.

From 4b81e72cff7a3acfde2cca919bd8e173355bc53c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 25 Nov 2019 18:40:50 +0800
Subject: [PATCH 161/161] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20pay=20=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E8=B0=83=E7=94=A8=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Pay.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 3e3fbad..dcc87ce 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -18,6 +18,7 @@ use WeChat\Contracts\BasicWePay;
 use WeChat\Exceptions\InvalidResponseException;
 use WePay\Bill;
 use WePay\Order;
+use WePay\Refund;
 use WePay\Transfers;
 use WePay\TransfersBank;
 
@@ -116,7 +117,7 @@ class Pay extends BasicWePay
      */
     public function createRefund(array $options)
     {
-        return Order::instance($this->config->get())->create($options);
+        return Refund::instance($this->config->get())->create($options);
     }
 
     /**
@@ -128,7 +129,7 @@ class Pay extends BasicWePay
      */
     public function queryRefund(array $options)
     {
-        return Order::instance($this->config->get())->query($options);
+        return Refund::instance($this->config->get())->query($options);
     }
 
     /**