Merge 0dc37d4 into 002f031

node-webot · Apr 4, 2018 · 0e61905 · 0e61905
2 parents 002f031 + 0dc37d4
commit 0e61905
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/api_common.js b/lib/api_common.js
@@ -57,7 +57,7 @@ class API {
    * @param {AsyncFunction} getToken 可选的。获取全局token对象的方法，多进程模式部署时需在意
    * @param {AsyncFunction} saveToken 可选的。保存全局token对象的方法，多进程模式部署时需在意
    */
-  constructor(appid, appsecret, getToken, saveToken) {
+  constructor(appid, appsecret, getToken, saveToken, tokenFromCustom) {
     this.appid = appid;
     this.appsecret = appsecret;
     this.getToken = getToken || async function () {
@@ -76,6 +76,7 @@ class API {
     this.merchantPrefix = 'https://api.weixin.qq.com/merchant/';
     this.customservicePrefix = 'https://api.weixin.qq.com/customservice/';
     this.defaults = {};
+    this.tokenFromCustom = tokenFromCustom;
     // set default js ticket handle
     this.registerTicketHandle();
   }
@@ -140,7 +141,7 @@ class API {
         err.name = 'WeChatAPIError';
         err.code = data.errcode;
 
-        if (err.code === 40001 && retry > 0) {
+        if (err.code === 40001 && retry > 0 && !this.tokenFromCustom) {
           // 销毁已过期的token
           await this.saveToken(null);
           let token = await this.getAccessToken();
@@ -202,6 +203,11 @@ class API {
     var accessToken;
     if (token && (accessToken = new AccessToken(token.accessToken, token.expireTime)).isValid()) {
       return accessToken;
+    } else if (this.tokenFromCustom) {
+      let err = new Error('accessToken Error');
+      err.name = 'WeChatAPIError';
+      err.code = 40001;
+      throw err;
     }
     return this.getAccessToken();
   }