q-koa 13.8.19 → 13.8.20

package/core/file/services/weixin.js

@@ -1,6 +1,6 @@
 const util = require('util')
 const axios = require('axios')
-const getAccessTokenUrl = `https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s`
+const getAccessTokenUrl = 'https://api.weixin.qq.com/cgi-bin/stable_token'
 const getTicketUrl =
   'https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi'
 const sha1 = require('sha1')
@@ -31,16 +31,22 @@ module.exports = class Singleton {
   init() {
     return this
   }
-  async getAccessToken() {
-    const { appid, secrect, grant_type } = this.config
-    if (cache.get('access_token')) {
-      return cache.get('access_token')
+  async getAccessToken(force_refresh = false) {
+    const { appid, secrect } = this.config
+    if (!force_refresh && cache.get(appid)) {
+      return cache.get(appid)
     }
-    const url = util.format(getAccessTokenUrl, grant_type, appid, secrect)
-    const result = await axios.get(url).then((res) => res.data)
+    const result = await axios
+      .post(getAccessTokenUrl, {
+        grant_type: 'client_credential',
+        appid,
+        secret: secrect,
+        force_refresh,
+      })
+      .then((res) => res.data)
     if (result.errcode) throw new Error(result.errmsg)
 
-    cache.set('access_token', result.access_token)
+    cache.set(appid, result.access_token)
     return result.access_token
   }
 

package/core/file/services/weixinMP.js

@@ -12,8 +12,7 @@ const util = require('util')
 const axios = require('axios')
 const crypto = require('crypto')
 const { lodash, ServiceError } = require('q-koa')
-const getAccessTokenUrl =
-  'https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s'
+const getAccessTokenUrl = 'https://api.weixin.qq.com/cgi-bin/stable_token'
 const getPhoneNumberUrl =
   'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s'
 const createQRCodeUrl =
@@ -173,14 +172,20 @@ module.exports = class Singleton {
     return this
   }
 
-  async getAccessToken() {
-    const { appid, secrect, grant_type } = this.config
-    if (cache.get(appid)) {
+  async getAccessToken(force_refresh = false) {
+    const { appid, secrect } = this.config
+    if (!force_refresh && cache.get(appid)) {
       return cache.get(appid)
     }
-    const url = util.format(getAccessTokenUrl, grant_type, appid, secrect)
+    const result = await wxAxios
+      .post(getAccessTokenUrl, {
+        grant_type: 'client_credential',
+        appid,
+        secret: secrect,
+        force_refresh,
+      })
+      .then((res) => res.data)
 
-    const result = await wxAxios.get(url).then((res) => res.data)
     const { errcode, errmsg, access_token } = result
 
     if (errcode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.8.19",
+  "version": "13.8.20",
   "description": "",
   "main": "index.js",
   "scripts": {