From 96e2b06d8f3711d1e83eb468beb71ba7e869a5a1 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 2 Feb 2018 18:36:22 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E7=9B=AE=E5=BD=95=E9=85=8D=E7=BD=AE=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=20[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                   |  2 +-
 Test/config.php             |  2 ++
 WeChat/Contracts/WeChat.php |  3 +++
 WeChat/Pay.php              | 15 +++++++++++----
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ba19438..59a2e75 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ WeChatDeveloper for PHP
 --
 * WeChatDeveloper 是基于 [wechat-php-sdk](https://github.com/zoujingli/wechat-php-sdk) 的重构，优化并完善；
 * 微信 SDK 运行最底要求 PHP 版本 5.4 , 建议在 PHP7 上运行以获取最佳性能；
-* WeChatDeveloper 针对 access_token 失效增加了自动重试机制；
+* WeChatDeveloper 针对 access_token 失效增加了自动刷新机制；
 * 微信的部分接口需要缓存数据在本地，因此对目录需要有写权限；
 * 我们鼓励大家使用 composer 来管理您的第三方库，方便后期更新操作；
 * WeChatDeveloper 已历经数个线上项目考验，欢迎 fork 或 star 此项目。
diff --git a/Test/config.php b/Test/config.php
index 732a81f..9825b59 100644
--- a/Test/config.php
+++ b/Test/config.php
@@ -23,4 +23,6 @@ return [
     // 配置商户支付双向证书目录
     'ssl_key'        => '',
     'ssl_cer'        => '',
+    // 配置缓存目录，需要拥有写权限
+    'cache_path'     => '',
 ];
\ No newline at end of file
diff --git a/WeChat/Contracts/WeChat.php b/WeChat/Contracts/WeChat.php
index d6b269b..96b2f0a 100644
--- a/WeChat/Contracts/WeChat.php
+++ b/WeChat/Contracts/WeChat.php
@@ -69,6 +69,9 @@ class WeChat
         if (isset($options['GetAccessTokenCallback']) && is_callable($options['GetAccessTokenCallback'])) {
             $this->GetAccessTokenCallback = $options['GetAccessTokenCallback'];
         }
+        if (!empty($options['cache_path'])) {
+            Tools::$cache_path = $options['cache_path'];
+        }
         $this->config = new DataArray($options);
     }
 
diff --git a/WeChat/Pay.php b/WeChat/Pay.php
index 8303228..93c40f7 100644
--- a/WeChat/Pay.php
+++ b/WeChat/Pay.php
@@ -46,10 +46,17 @@ class Pay
      */
     public function __construct(array $options)
     {
-        foreach (['appid', 'mch_id', 'mch_key'] as $key) {
-            if (empty($options[$key])) {
-                throw new InvalidArgumentException("Missing Config -- [{$key}]", '0');
-            }
+        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([