q-koa 7.9.6 → 7.9.9

package/core/app.js

@@ -795,11 +795,11 @@ class APP {
       }
       await next()
     })
-    router.post('/:controller/:fn', async (ctx) => {
+    const handleRouter = async (ctx) => {
       const appName = router.opts.prefix.substring(1)
       const { app } = ctx
 
-      const { controller, fn } = ctx.params
+      const { controller, fn, sub } = ctx.params
       if (_.get(app, `${appName}.model.${controller}`) && fn === 'mock') {
         return ctx.SUCCESS(await app[appName].mock[controller]())
       }
@@ -1724,7 +1724,10 @@ class APP {
             })
         }
       }
-    })
+    }
+
+    router.post('/:controller/:fn', handleRouter)
+    router.post('/:controller/:fn/:sub', handleRouter)
   }
 }
 

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

@@ -1008,13 +1008,14 @@ exports.sendMessage = async (ctx) => {
 exports.refund = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  const { id, prefix = '', price } = ctx.request.body
+  const { id, prefix = '', price, pay_config = 'weixin_pay' } = ctx.request.body
 
   await app.service.weixin.refund({
     ctx,
     id,
-    prefix: '',
+    prefix,
     price,
+    pay_config,
   })
   ctx.SUCCESS('ok')
 }
@@ -1049,7 +1050,7 @@ const getRefundResultJson = async ({ req_info, app_key }) => {
 exports.refund_notify = async (ctx) => {
   const { app } = getAppByCtx(ctx)
   const result = ctx.request.xmlBody
-  const pay_config = ctx.request.query.pay_config || 'weixin_pay'
+  const pay_config = ctx.params.sub || 'weixin_pay'
 
   const appConfig = getConfig(app)
   const { key } = await appConfig.getObject(pay_config)

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

@@ -27,7 +27,7 @@ exports.refund = async ({
     pfx: await fsPromise.readFile(
       path.resolve(
         __dirname,
-        `${process.cwd()}/app/${appName}/plugins/weixin/apiclient_cert.p12`
+        `${process.cwd()}/app/${appName}/plugins/weixin/${pay_config}/apiclient_cert.p12`
       )
     ), // 微信商户平台证书
   })
@@ -50,7 +50,7 @@ exports.refund = async ({
       refund_fee: Math.round((refund_fee || price) * 100),
       notify_url: `https://${
         site_host || 'api.kuashou.com'
-      }/${appName}/weixin/refund_notify?pay_config=weixin_pay`,
+      }/${appName}/weixin/refund_notify/${pay_config}`,
     })
     if (result_code === 'SUCCESS') {
       return true

package/package.json

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