From 9dd8ea2d0b0fef10e3d1024f135cd0f814b6a698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Wed, 1 Apr 2020 11:53:15 +0800
Subject: [PATCH] add clear

---
 wchat/wx/Account.php        | 10 ++++++++++
 wchat/wx/Message.php        |  2 ++
 wchat/wx/PublicTemplate.php |  3 ++-
 wchat/wx/Recharge.php       |  2 ++
 wchat/wx/SecCheck.php       | 12 +++++++++---
 wchat/wx/SmallProgram.php   |  2 ++
 wchat/wx/Subject.php        |  2 ++
 wchat/wx/Template.php       |  3 ++-
 8 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/wchat/wx/Account.php b/wchat/wx/Account.php
index e5c4e06..0fe6cf6 100644
--- a/wchat/wx/Account.php
+++ b/wchat/wx/Account.php
@@ -50,6 +50,8 @@ class Account extends SmallProgram
 
 		$this->request->setMethod(HttpClient::GET);
 		$this->request->addHeader('Content-Type', 'text/xml');
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 
 		return $this->request->get('sns/jscode2session', $param);
 	}
@@ -69,6 +71,8 @@ class Account extends SmallProgram
 
 		$this->request->setMethod(HttpClient::GET);
 		$this->request->setIsSSL(true);
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		return $this->request->get($this->publicInfo, $query);
 	}
 
@@ -114,6 +118,8 @@ class Account extends SmallProgram
 
 		$this->request->setMethod(HttpClient::POST);
 		$this->request->setCallback([$this, 'saveByPath']);
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 
 		return $this->request->post($url, $sendBody);
 	}
@@ -142,6 +148,8 @@ class Account extends SmallProgram
 
 		$this->request->setMethod(HttpClient::POST);
 		$this->request->setCallback([$this, 'saveByPath']);
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		return $this->request->post($url, $sendBody);
 	}
 
@@ -169,6 +177,8 @@ class Account extends SmallProgram
 
 		$this->request->setMethod(HttpClient::POST);
 		$this->request->setCallback([$this, 'saveByPath']);
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		return $this->request->post($url, $sendBody);
 	}
 
diff --git a/wchat/wx/Message.php b/wchat/wx/Message.php
index 55eba9a..d87a0f9 100644
--- a/wchat/wx/Message.php
+++ b/wchat/wx/Message.php
@@ -300,6 +300,8 @@ class Message extends SmallProgram
 
 		$url = '/cgi-bin/message/custom/send?access_token=' . $this->getAccessToken();
 		$this->request->setMethod(HttpClient::POST);
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 
 		/** @var Result $body */
 		$body = $this->request->post($url, $data);
diff --git a/wchat/wx/PublicTemplate.php b/wchat/wx/PublicTemplate.php
index 3151520..7125acb 100644
--- a/wchat/wx/PublicTemplate.php
+++ b/wchat/wx/PublicTemplate.php
@@ -147,7 +147,8 @@ class PublicTemplate extends SmallProgram
 
 		$this->request->setIsSSL(true);
 		$this->request->addHeader('content-type', 'application/json');
-
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		$result = $this->request->post($url, $params);
 		$result->append('postBody', $params);
 
diff --git a/wchat/wx/Recharge.php b/wchat/wx/Recharge.php
index b7d3418..d2a2bc4 100644
--- a/wchat/wx/Recharge.php
+++ b/wchat/wx/Recharge.php
@@ -175,6 +175,8 @@ class Recharge extends SmallProgram
 		$this->request->setIsSSL(true);
 		$this->request->setMethod(HttpClient::POST);
 		$this->request->addHeader('Content-Type', 'text/xml');
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		return $this->request->send($url, $data);
 	}
 }
diff --git a/wchat/wx/SecCheck.php b/wchat/wx/SecCheck.php
index 6c8fe3f..cbef251 100644
--- a/wchat/wx/SecCheck.php
+++ b/wchat/wx/SecCheck.php
@@ -32,7 +32,9 @@ class SecCheck extends SmallProgram
 			return $this->sendError('文件不存在', 404);
 		}
 		$this->request->setUseSwoole(false);
-		$this->request->setHeader(['Content-Type' => 'multipart/form-data']);
+		$this->request->setHeader('Content-Type', 'multipart/form-data');
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		return $this->request->post($this->_url . $this->config->getAccessToken(), ['media' => new \CURLFile($path)]);
 	}
 
@@ -48,7 +50,9 @@ class SecCheck extends SmallProgram
 		if (!in_array($type, [self::MEDIA_IMAGE, self::MEDIA_VIDEO])) {
 			throw new \Exception('暂不支持的文件类型');
 		}
-		$this->request->setHeader(['Content-Type' => 'application/json']);
+		$this->request->setHeader('Content-Type', 'application/json');
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		$response = $this->request->post($this->_mediaCheckAsync . $this->config->getAccessToken(), [
 			'media_url'  => $url,
 			'media_type' => $type
@@ -79,7 +83,9 @@ class SecCheck extends SmallProgram
 		if (empty($content)) {
 			return $this->sendError('文件不存在', 404);
 		}
-		$this->request->setHeader(['Content-Type' => 'application/json']);
+		$this->request->setHeader('Content-Type', 'application/json');
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		return $this->request->post($this->_msgUrl . $this->config->getAccessToken(), ['content' => $content]);
 	}
 
diff --git a/wchat/wx/SmallProgram.php b/wchat/wx/SmallProgram.php
index d055dc5..310f822 100644
--- a/wchat/wx/SmallProgram.php
+++ b/wchat/wx/SmallProgram.php
@@ -28,6 +28,8 @@ class SmallProgram extends Miniprogarampage
 			'appid'      => $this->config->getAppid(),
 			'secret'     => $this->config->getAppsecret()
 		];
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		$param = $this->request->get($this->url, $query);
 		if (!$param->isResultsOK()) {
 			throw new \Exception($param->getMessage());
diff --git a/wchat/wx/Subject.php b/wchat/wx/Subject.php
index ff41a0b..fab5908 100644
--- a/wchat/wx/Subject.php
+++ b/wchat/wx/Subject.php
@@ -125,6 +125,8 @@ class Subject extends SmallProgram
 		$this->request->setIsSSL(true);
 		$this->request->addHeader('content-type', 'application/json');
 
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		$result = $this->request->post($url, $params);
 		$result->append('postBody', $params);
 
diff --git a/wchat/wx/Template.php b/wchat/wx/Template.php
index 3ea3cf2..a7ff468 100644
--- a/wchat/wx/Template.php
+++ b/wchat/wx/Template.php
@@ -136,7 +136,8 @@ class Template extends SmallProgram
 
 		$this->request->setIsSSL(true);
 		$this->request->addHeader('content-type', 'application/json');
-
+		$this->request->setErrorField('errcode');
+		$this->request->setErrorMsgField('errmsg');
 		$result = $this->request->post($url, $params);
 		$result->append('postBody', $params);