q-koa 8.5.2 → 8.5.5

package/core/file/plugins/weixin/service.js

@@ -112,6 +112,7 @@ exports.cash = async ({
   if (result.err_code_des) throw new Error(result.err_code_des)
   return result
 }
+
 exports.qr_code = async ({
   app,
   page,
@@ -168,18 +169,38 @@ exports.qr_code = async ({
     const fileName = `${
       String(new Date().getTime()).split('').reverse().join('') + Math.random()
     }.png`
-    const result = await client.put(fileName, buffer)
-    if (result.res && result.res.status === 200) {
-      if (oss_host && cdn_host) {
-        const url = result.url.replace(oss_host, cdn_host)
-        return url
+
+    const handelResult = (result) => {
+      if (result && result.res && result.res.status === 200) {
+        if (oss_host && cdn_host) {
+          const url = result.url.replace(oss_host, cdn_host)
+          return url
+        } else {
+          return result.url
+        }
       } else {
-        const url = result.url
-        return url
+        return null
       }
-    } else {
-      throw new Error(result.res.statusMessage)
     }
+
+    return client
+      .put(fileName, buffer)
+
+      .then((result) => {
+        if (result && result.res && result.res.status === 200) {
+          if (oss_host && cdn_host) {
+            const url = result.url.replace(oss_host, cdn_host)
+            return Promise.resolve(url)
+          } else {
+            return Promise.resolve(result.url)
+          }
+        } else {
+          return Promise.reject(new Error('小程序码生成错误，请重试'))
+        }
+      })
+      .catch((e) => {
+        return Promise.reject(new Error(e.message))
+      })
   }
 }
 

package/core/file/services/weixinMP.js

@@ -404,7 +404,6 @@ module.exports = class Singleton {
             .join('&')
         : '',
     }
-    const creatuuid = uuid.v1()
 
     const bufferResult = await axios
       .post(url, payLoad, {
@@ -419,7 +418,7 @@ module.exports = class Singleton {
     if (bufferResult.errcode) {
       if (bufferResult.errcode === 40001) {
         cache.reset()
-        return await this.createQR(options)
+        return await this.createQRBuffer(options)
       }
       throw new Error(bufferResult.errmsg)
     }

package/package.json

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