From 03e283087f8a50249663e8f9da3ce57968fa2188 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 2 Feb 2018 19:51:28 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E6=94=AF=E6=8C=81=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Card.php                                      | 4 ++--
 WeChat/Contracts/{Request.php => BasicPushEvent.php} | 6 +++---
 WeChat/Contracts/{WeChat.php => BasicWeChat.php}     | 6 +++---
 WeChat/Custom.php                                    | 4 ++--
 WeChat/Media.php                                     | 4 ++--
 WeChat/Menu.php                                      | 4 ++--
 WeChat/Oauth.php                                     | 4 ++--
 WeChat/Product.php                                   | 4 ++--
 WeChat/Qrcode.php                                    | 4 ++--
 WeChat/Receive.php                                   | 4 ++--
 WeChat/Scan.php                                      | 4 ++--
 WeChat/Script.php                                    | 4 ++--
 WeChat/Shake.php                                     | 4 ++--
 WeChat/Tags.php                                      | 4 ++--
 WeChat/Template.php                                  | 4 ++--
 WeChat/User.php                                      | 4 ++--
 WeChat/Wifi.php                                      | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)
 rename WeChat/Contracts/{Request.php => BasicPushEvent.php} (98%)
 rename WeChat/Contracts/{WeChat.php => BasicWeChat.php} (98%)

diff --git a/WeChat/Card.php b/WeChat/Card.php
index ca1c348..c0f1957 100644
--- a/WeChat/Card.php
+++ b/WeChat/Card.php
@@ -15,14 +15,14 @@
 namespace Wechat;
 
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 卡券管理
  * Class Card
  * @package Wechat
  */
-class Card extends WeChat
+class Card extends BasicWeChat
 {
     /**
      * 创建卡券
diff --git a/WeChat/Contracts/Request.php b/WeChat/Contracts/BasicPushEvent.php
similarity index 98%
rename from WeChat/Contracts/Request.php
rename to WeChat/Contracts/BasicPushEvent.php
index fc1d408..64e8ac1 100644
--- a/WeChat/Contracts/Request.php
+++ b/WeChat/Contracts/BasicPushEvent.php
@@ -20,10 +20,10 @@ use WeChat\Exceptions\InvalidResponseException;
 
 /**
  * 微信通知处理基本类
- * Class Request
+ * Class BasicPushEvent
  * @package WeChat\Contracts
  */
-class Request
+class BasicPushEvent
 {
     /**
      * 公众号APPID
@@ -68,7 +68,7 @@ class Request
     protected $message;
 
     /**
-     * Request constructor.
+     * BasicPushEvent constructor.
      * @param array $options
      * @throws InvalidResponseException
      */
diff --git a/WeChat/Contracts/WeChat.php b/WeChat/Contracts/BasicWeChat.php
similarity index 98%
rename from WeChat/Contracts/WeChat.php
rename to WeChat/Contracts/BasicWeChat.php
index 96b2f0a..2ec029f 100644
--- a/WeChat/Contracts/WeChat.php
+++ b/WeChat/Contracts/BasicWeChat.php
@@ -18,10 +18,10 @@ use WeChat\Exceptions\InvalidArgumentException;
 use WeChat\Exceptions\InvalidResponseException;
 
 /**
- * Class Wechat
+ * Class BasicWeChat
  * @package WeChat\Contracts
  */
-class WeChat
+class BasicWeChat
 {
 
     /**
@@ -55,7 +55,7 @@ class WeChat
     private $GetAccessTokenCallback;
 
     /**
-     * Wechat constructor.
+     * BasicWeChat constructor.
      * @param array $options
      */
     public function __construct(array $options)
diff --git a/WeChat/Custom.php b/WeChat/Custom.php
index b7a43bc..118f44d 100644
--- a/WeChat/Custom.php
+++ b/WeChat/Custom.php
@@ -14,14 +14,14 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 客服消息处理
  * Class Custom
  * @package WeChat
  */
-class Custom extends WeChat
+class Custom extends BasicWeChat
 {
     /**
      * 添加客服帐号
diff --git a/WeChat/Media.php b/WeChat/Media.php
index 20603d3..7dd8511 100644
--- a/WeChat/Media.php
+++ b/WeChat/Media.php
@@ -15,7 +15,7 @@
 namespace WeChat;
 
 use WeChat\Contracts\Tools;
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 use WeChat\Exceptions\InvalidResponseException;
 
 /**
@@ -23,7 +23,7 @@ use WeChat\Exceptions\InvalidResponseException;
  * Class Media
  * @package WeChat
  */
-class Media extends WeChat
+class Media extends BasicWeChat
 {
     /**
      * 新增临时素材
diff --git a/WeChat/Menu.php b/WeChat/Menu.php
index 2996156..8e8fe4e 100644
--- a/WeChat/Menu.php
+++ b/WeChat/Menu.php
@@ -14,14 +14,14 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 微信菜单管理
  * Class Menu
  * @package WeChat
  */
-class Menu extends WeChat
+class Menu extends BasicWeChat
 {
 
     /**
diff --git a/WeChat/Oauth.php b/WeChat/Oauth.php
index 2928d9e..a49459d 100644
--- a/WeChat/Oauth.php
+++ b/WeChat/Oauth.php
@@ -14,14 +14,14 @@
 
 namespace Wechat;
 
-use WeChat\Contracts\Wechat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 微信网页授权
  * Class Oauth
  * @package Wechat
  */
-class Oauth extends Wechat
+class Oauth extends BasicWeChat
 {
 
     /**
diff --git a/WeChat/Product.php b/WeChat/Product.php
index 0973465..b1add21 100644
--- a/WeChat/Product.php
+++ b/WeChat/Product.php
@@ -15,14 +15,14 @@
 namespace WeChat;
 
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 商店管理
  * Class Product
  * @package WeChat
  */
-class Product extends WeChat
+class Product extends BasicWeChat
 {
     /**
      * 提交审核/取消发布商品
diff --git a/WeChat/Qrcode.php b/WeChat/Qrcode.php
index 256939b..e23bf0c 100644
--- a/WeChat/Qrcode.php
+++ b/WeChat/Qrcode.php
@@ -14,14 +14,14 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 二维码管理
  * Class Qrcode
  * @package WeChat
  */
-class Qrcode extends WeChat
+class Qrcode extends BasicWeChat
 {
 
     /**
diff --git a/WeChat/Receive.php b/WeChat/Receive.php
index 1cb78cf..7e1659f 100644
--- a/WeChat/Receive.php
+++ b/WeChat/Receive.php
@@ -14,14 +14,14 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\Request;
+use WeChat\Contracts\BasicPushEvent;
 
 /**
  * 公众号推送管理
  * Class Receive
  * @package WeChat
  */
-class Receive extends Request
+class Receive extends BasicPushEvent
 {
 
     /**
diff --git a/WeChat/Scan.php b/WeChat/Scan.php
index 49776b7..ad272eb 100644
--- a/WeChat/Scan.php
+++ b/WeChat/Scan.php
@@ -14,14 +14,14 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 扫一扫接入管理
  * Class Scan
  * @package WeChat
  */
-class Scan extends WeChat
+class Scan extends BasicWeChat
 {
     /**
      * 获取商户信息
diff --git a/WeChat/Script.php b/WeChat/Script.php
index 26710a0..a8a664d 100644
--- a/WeChat/Script.php
+++ b/WeChat/Script.php
@@ -15,7 +15,7 @@
 namespace WeChat;
 
 use WeChat\Contracts\Tools;
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 use WeChat\Exceptions\InvalidResponseException;
 
 /**
@@ -23,7 +23,7 @@ use WeChat\Exceptions\InvalidResponseException;
  * Class Script
  * @package WeChat
  */
-class Script extends WeChat
+class Script extends BasicWeChat
 {
 
     /**
diff --git a/WeChat/Shake.php b/WeChat/Shake.php
index ad7a442..2d25958 100644
--- a/WeChat/Shake.php
+++ b/WeChat/Shake.php
@@ -16,14 +16,14 @@ namespace WeChat;
 
 
 use WeChat\Contracts\Tools;
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 揺一揺周边
  * Class Shake
  * @package WeChat
  */
-class Shake extends WeChat
+class Shake extends BasicWeChat
 {
     /**
      * 申请开通功能
diff --git a/WeChat/Tags.php b/WeChat/Tags.php
index f11767b..82e7e40 100644
--- a/WeChat/Tags.php
+++ b/WeChat/Tags.php
@@ -14,14 +14,14 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 用户标签管理
  * Class Tags
  * @package WeChat
  */
-class Tags extends WeChat
+class Tags extends BasicWeChat
 {
     /**
      * 获取粉丝标签列表
diff --git a/WeChat/Template.php b/WeChat/Template.php
index 1a8454b..bc79740 100644
--- a/WeChat/Template.php
+++ b/WeChat/Template.php
@@ -14,14 +14,14 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 模板消息
  * Class Template
  * @package WeChat
  */
-class Template extends WeChat
+class Template extends BasicWeChat
 {
     /**
      * 设置所属行业
diff --git a/WeChat/User.php b/WeChat/User.php
index 3c5805e..742cd6f 100644
--- a/WeChat/User.php
+++ b/WeChat/User.php
@@ -14,14 +14,14 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 微信粉丝管理
  * Class User
  * @package WeChat
  */
-class User extends WeChat
+class User extends BasicWeChat
 {
 
     /**
diff --git a/WeChat/Wifi.php b/WeChat/Wifi.php
index c78103a..ecc45a4 100644
--- a/WeChat/Wifi.php
+++ b/WeChat/Wifi.php
@@ -15,14 +15,14 @@
 namespace WeChat;
 
 
-use WeChat\Contracts\WeChat;
+use WeChat\Contracts\BasicWeChat;
 
 /**
  * 门店 WIFI 管理
  * Class Wifi
  * @package WeChat
  */
-class Wifi extends WeChat
+class Wifi extends BasicWeChat
 {
 
     /**