Merge 2bdc69e into 32146f6

node-webot · Dec 23, 2019 · 8321606 · 8321606
2 parents 32146f6 + 2bdc69e
commit 8321606
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/api_common.js b/lib/api_common.js
@@ -127,12 +127,16 @@ class API {
 
     var buffer = await httpx.read(res);
     var contentType = res.headers['content-type'] || '';
-    if (contentType.indexOf('application/json') !== -1) {
+    if (contentType.includes('application/json') || contentType.includes('text/plain')) {
       var data;
       var origin = buffer.toString();
       try {
         data = JSONbig.parse(replaceJSONCtlChars(origin));
       } catch (ex) {
+        if (contentType.includes('text/plain')) {
+          return origin;
+        }
+
         let err = new Error('JSON.parse error. buffer is ' + origin);
         err.name = 'WeChatAPIError';
         throw err;

diff --git a/lib/api_material.js b/lib/api_material.js
@@ -143,7 +143,7 @@ exports.uploadNewsMaterial = async function (news) {
  * ```
  * Examples:
  * ```
- * api.uploadNewsMaterial(news);
+ * api.updateNewsMaterial(news);
  * ```
  * Result:
  * ```
@@ -153,7 +153,7 @@ exports.uploadNewsMaterial = async function (news) {
  */
 exports.updateNewsMaterial = async function (news) {
   const { accessToken } = await this.ensureAccessToken();
-  var url = this.prefix + 'material/add_news?access_token=' + accessToken;
+  var url = this.prefix + 'material/update_news?access_token=' + accessToken;
   return this.request(url, postJSON(news));
 };
 /**