q-koa 8.1.4 → 8.1.7

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

@@ -986,62 +986,16 @@ exports.qr_code = async (ctx) => {
     config = 'weixin_mp',
   } = ctx.request.body
 
-  // if (!lodash.get(ctx.request, `${appName}-user.id`, null)) throw new Error('没有登录')
-
-  const appConfig = getConfig(app)
-  const { app_id, app_secrect } = await appConfig.getObject(config)
-
-  const { site_host } = await appConfig.getObject('base')
-  const weixinMp = new WeixinMp({
-    appid: app_id,
-    secrect: app_secrect,
-    targetPath: `${path.resolve(__dirname, `${process.cwd()}/public/upload`)}`,
+  const result = await app.service.weixin.qr_code({
+    app,
+    page,
+    is_hyaline,
+    scene,
+    is_oss = false,
+    config = 'weixin_mp',
   })
-  weixinMp.init()
-  if (!is_oss) {
-    const result = await weixinMp.createQR({
-      page,
-      is_hyaline,
-      scene,
-    })
-    const qr_image = `https://${
-      site_host || 'api.kuashou.com'
-    }/upload/${result}`
 
-    ctx.SUCCESS(qr_image)
-  } else {
-    const {
-      accessKeyId,
-      accessKeySecret,
-      bucket,
-      region,
-    } = await appConfig.getObject('oss')
-    if (!(accessKeyId && accessKeySecret && bucket && region)) {
-      throw new Error('没有配置oss设置')
-    }
-    const buffer = await weixinMp.createQRBuffer({
-      page,
-      is_hyaline,
-      scene,
-    })
-    const client = new OSS({
-      accessKeyId,
-      accessKeySecret,
-      bucket,
-      region,
-      secure: true,
-    })
-    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) {
-      const url = result.url
-      return ctx.SUCCESS(url)
-    } else {
-      throw new Error(result.res.statusMessage)
-    }
-  }
+  return ctx.SUCCESS(result)
 }
 
 exports.sendMessage = async (ctx) => {
@@ -1221,7 +1175,6 @@ exports.checkPay = async (ctx) => {
   const payResult = await checkOrder({
     out_trade_no,
   })
-
   if (payResult.trade_state_desc === '支付成功') {
     const order_price = Number(payResult.total_fee) / 100
     await app.service[orderModel].notify({

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

@@ -1,8 +1,9 @@
 const { getAppByCtx, getConfig } = require('q-koa')
 const { Pay } = require('@sigodenjs/wechatpay')
-const fs = require('fs')
 const path = require('path')
 const fsPromise = require('fs/promises')
+const WeixinMp = require('../../services/weixinMP')
+const OSS = require('ali-oss')
 
 exports.refund = async ({
   ctx,
@@ -106,3 +107,73 @@ exports.cash = async ({ ctx, id, user_id, number }) => {
   if (result.err_code_des) throw new Error(result.err_code_des)
   return result
 }
+exports.qr_code = async ({
+  app,
+  page,
+  is_hyaline,
+  scene,
+  is_oss = false,
+  config = 'weixin_mp',
+}) => {
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+
+  const { site_host } = await appConfig.getObject('base')
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+    targetPath: `${path.resolve(__dirname, `${process.cwd()}/public/upload`)}`,
+  })
+  weixinMp.init()
+  if (!is_oss) {
+    const result = await weixinMp.createQR({
+      page,
+      is_hyaline,
+      scene,
+    })
+    const qr_image = `https://${
+      site_host || 'api.kuashou.com'
+    }/upload/${result}`
+
+    return qr_image
+  } else {
+    const {
+      accessKeyId,
+      accessKeySecret,
+      bucket,
+      region,
+      cdn_host,
+      oss_host,
+    } = await appConfig.getObject('oss')
+    if (!(accessKeyId && accessKeySecret && bucket && region)) {
+      throw new Error('没有配置oss设置')
+    }
+    const buffer = await weixinMp.createQRBuffer({
+      page,
+      is_hyaline,
+      scene,
+    })
+    const client = new OSS({
+      accessKeyId,
+      accessKeySecret,
+      bucket,
+      region,
+      secure: true,
+    })
+    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
+      } else {
+        const url = result.url
+        return url
+      }
+    } else {
+      throw new Error(result.res.statusMessage)
+    }
+  }
+}

package/core/file/services/weixinMP.js

@@ -320,7 +320,7 @@ module.exports = class Singleton {
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.reset()
-        return await this.getPhoneNumber(code)
+        return await this.createUrlLink(options)
       }
       throw new Error(`${result.errcode};${result.errmsg}`)
     }
@@ -348,7 +348,7 @@ module.exports = class Singleton {
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.reset()
-        return await this.getPhoneNumber(code)
+        return await this.createUrlscheme(options)
       }
       throw new Error(`${result.errcode};${result.errmsg}`)
     }

package/package.json

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