q-koa 7.9.8 → 8.0.1

package/core/app.js

@@ -236,7 +236,7 @@ class APP {
       ) {
         this.app[appName].model.log.upsert(errorData)
       }
-      throw new Error(err)
+      throw new Error(err.message)
     })
 
     // this.app.on('message', async (content) => {
@@ -381,7 +381,7 @@ class APP {
       } catch (e) {
         console.log(`${appName}数据库连接失败`)
         console.log(e)
-        throw new Error(e)
+        throw new Error(e.message)
       }
       if (
         this.app[appName] &&
@@ -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)
   }
 }
 
@@ -1761,7 +1764,14 @@ APP.getAppByCtx = (ctx) => {
     controller,
   }
 }
-
+APP.getUserByCtx = (ctx) => {
+  try {
+    const appName = ctx.router.opts.prefix.substring(1)
+    return ctx.request[`${appName}-user`].id
+  } catch (e) {
+    return 0
+  }
+}
 APP.getClientTypeByCtx = (ctx) => {
   const typeEnum = {
     1: 'admin',

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

@@ -80,7 +80,7 @@ exports.mp_getPhone = async (ctx) => {
     (!exist.mp_user.appid || exist.mp_user.appid === app_id)
 
   if (mobileExist) {
-    throw new Error('系统已存在该手机号')
+    return ctx.ERROR('系统已存在该手机号')
   }
 
   const userResult = await app.model.mp_user.findOne({
@@ -90,7 +90,7 @@ exports.mp_getPhone = async (ctx) => {
   })
 
   if (!userResult || !userResult.user_id)
-    throw new Error('微信获取手机失败,请重试')
+    return ctx.ERROR('微信获取手机失败,请重试')
 
   await app.model.user.upsert({
     id: userResult.user_id,
@@ -207,7 +207,7 @@ exports.mp_getPhoneNew = async (ctx) => {
     (!exist.mp_user.appid || exist.mp_user.appid === app_id)
 
   if (mobileExist) {
-    throw new Error('系统已存在该手机号')
+    return ctx.ERROR('系统已存在该手机号')
   }
 
   await app.model.user.upsert({
@@ -1050,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

@@ -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.8",
+  "version": "8.0.1",
   "description": "",
   "main": "index.js",
   "scripts": {