q-koa 7.9.5 → 7.9.8

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

@@ -331,7 +331,6 @@ exports.checkLogin = async (ctx) => {
     const token = await app.sign({
       user: tokenResult,
     })
-    console.log('app.appConfig.loginData', app.appConfig.loginData)
     return ctx.SUCCESS({
       token,
       user: app.appConfig.loginData

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

@@ -174,11 +174,11 @@ exports.getPhone = async (ctx) => {
 exports.mp_getPhoneNew = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
-  const { code } = ctx.request.body
+  const { code, config = 'weixin_mp' } = ctx.request.body
 
   const user_id = ctx.request[appName + '-user'].id
   const appConfig = getConfig(app)
-  const { app_id, app_secrect } = await appConfig.getObject('weixin_mp')
+  const { app_id, app_secrect } = await appConfig.getObject(config)
 
   const weixinMp = new WeixinMp({
     appid: app_id,
@@ -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')
 }

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`
       )
     ), // 微信商户平台证书
   })

package/package.json

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