q-koa 9.3.1 → 9.3.4

package/core/app.js

@@ -1819,6 +1819,7 @@ APP.getAppByCtx = (ctx) => {
   const appName = ctx.router.opts.prefix.substring(1)
 
   let controller = ''
+  let payName = appName
   try {
     const url = ctx.request.url
     const _split = url.split('/')
@@ -1826,10 +1827,23 @@ APP.getAppByCtx = (ctx) => {
   } catch (e) {
     console.warn(e)
   }
+  try {
+    const url = ctx.request.url
+    const referer = ctx.request.header.referer
+    if (!referer.includes(url)) {
+      const arr = ctx.request.header.referer.split('/').reverse()
+      if (arr.length >= 4) {
+        payName = arr[2]
+      }
+    }
+  } catch (e) {
+    console.warn(e)
+  }
   const { [appName]: app } = ctx.app
   return {
     appName,
     app,
+    payName,
     controller,
   }
 }

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

@@ -1,6 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const fsPromise = require('fs/promises')
+const { lodash } = require('q-koa')
 exports.loadModel = async ({ app, appName }) => {
   const data = await fsPromise.readdir(
     path.resolve(__dirname, `${process.cwd()}/app/${appName}/plugins`)
@@ -15,7 +16,11 @@ exports.loadModel = async ({ app, appName }) => {
       })
     )
   )
-
+  const currentDisabledFindAllList = lodash.get(
+    app,
+    'appConfig.disabledFindAllList',
+    []
+  )
   const dataList = []
   let disabledFindAllList = []
   const result = data.filter(
@@ -64,7 +69,7 @@ exports.loadModel = async ({ app, appName }) => {
 
       let countNumber = 0
       if (!['setting', 'auth'].includes(config.belongs)) {
-        if (app.model[result[i]]) {
+        if (currentDisabledFindAllList.length === 0 && app.model[result[i]]) {
           countNumber = await app.model[result[i]].count()
         }
         if (countNumber >= 500) {
@@ -223,7 +228,11 @@ exports.loadModel = async ({ app, appName }) => {
 
   await Promise.all([promise1, promise2])
   console.log('lodaModel success!')
-  console.warn(`disabledFindAllList: ${JSON.stringify(disabledFindAllList)}`)
+  if (currentDisabledFindAllList.length > 0) {
+    console.warn(`当前disabledFindAllList不为空，查看需清空`)
+  } else {
+    console.warn(`disabledFindAllList: ${JSON.stringify(disabledFindAllList)}`)
+  }
 
   if (app.service.routes && app.model.routes) {
     await app.service.routes.initRouter({ app })

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

@@ -14,37 +14,64 @@ exports.copyOther = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
   const { type, source } = ctx.request.body
-
-  const { data } = await axios
-    .post(`http://localhost:3001/${source}/setting/findAll`)
-    .then((res) => res.data)
-
+  const url = source.startsWith('http')
+    ? source
+    : `http://localhost:3001/${source}/setting/findAll`
+  const result = await axios.post(url).then((res) => res.data)
+  if (result.code !== 200) {
+    throw new Error(result.message + url)
+  }
+  const { data } = result
   const copyType = data.find((item) => item.code === type)
 
   if (!copyType) throw new Error('克隆方找不到')
 
-  const copyList = data.filter((item) => item.parent_id === copyType.id)
-
   const list = await app.model.setting.findAll()
 
   const findType = list.find((item) => item.code === type)
-  if (!findType) throw new Error('自己找不到')
-
-  await app.model.setting.destroy({
-    where: {
-      parent_id: findType.id,
-    },
-  })
+  if (findType && findType.parent_id) {
+    if (!findType) {
+      throw new Error(`当前找不到${type}`)
+    }
+    await app.model.setting.upsert({
+      id: findType.id,
+      value: copyType.value,
+    })
+    return ctx.SUCCESS('ok')
+  }
+  const copyList = data.filter((item) => item.parent_id === copyType.id)
 
-  await app.model.setting.bulkCreate(
-    copyList.map((item) => {
-      const { parent, id, ...rest } = item
-      return {
-        ...rest,
+  if (!findType) {
+    const { id, ...rest } = copyType
+    const newParent = await app.model.setting.create({
+      ...rest,
+    })
+    await app.model.setting.bulkCreate(
+      copyList.map((item) => {
+        const { parent, id, ...rest } = item
+        return {
+          ...rest,
+          parent_id: newParent.id,
+        }
+      })
+    )
+  } else {
+    await app.model.setting.destroy({
+      where: {
         parent_id: findType.id,
-      }
+      },
     })
-  )
+
+    await app.model.setting.bulkCreate(
+      copyList.map((item) => {
+        const { parent, id, ...rest } = item
+        return {
+          ...rest,
+          parent_id: findType.id,
+        }
+      })
+    )
+  }
 
   ctx.SUCCESS('ok')
 }

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

@@ -31,6 +31,8 @@ exports.initModel = async (ctx) => {
       return ctx.ERROR('请检查，model为空')
     const result = await app.model[model].sync(config)
     return ctx.SUCCESS(result)
+  } else {
+    return ctx.ERROR(`app.model没有${model}`)
   }
   return ctx.SUCCESS(null)
 }

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

@@ -759,13 +759,15 @@ exports.h5_pay = async (ctx) => {
     key: key.length > 10 ? key : partner_key,
     mchId,
   })
+
+  const notify_url = `https://${
+    site_host || 'api.kuashou.com'
+  }/${appName}/weixin/notify`
   const result = await payObj.run({
     body: name,
     out_trade_no: `${appName}_${order_id}_${type}`,
     total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
-    notify_url: `https://${
-      site_host || 'api.kuashou.com'
-    }/${appName}/weixin/notify`,
+    notify_url,
     scene_info: `{"h5_info": {"type":"Wap","wap_url": ${
       site_host || 'https://api.kuashou.com'
     },"wap_name": "腾讯充值"}}`,
@@ -780,7 +782,7 @@ exports.h5_pay = async (ctx) => {
 }
 
 exports.mp_pay = async (ctx) => {
-  const { app, appName } = getAppByCtx(ctx)
+  const { app, appName, payName } = getAppByCtx(ctx)
   const {
     name,
     order_id,
@@ -841,9 +843,12 @@ exports.mp_pay = async (ctx) => {
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${appName}_${prefix}-${order_id}_${type}`
-    : `${appName}_${order_id}_${type}`
+    ? `${payName}_${prefix}-${order_id}_${type}`
+    : `${payName}_${order_id}_${type}`
 
+  const notify_url = `https://${
+    site_host || 'api.kuashou.com'
+  }/${payName}/weixin/notify`
   const prePayResult = await pay({
     openid: userDetail.openid,
     body: name,
@@ -851,9 +856,7 @@ exports.mp_pay = async (ctx) => {
     out_trade_no,
     total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
     spbill_create_ip: '192.168.2.210',
-    notify_url: `http://${
-      site_host || 'api.kuashou.com'
-    }/${appName}/weixin/notify`,
+    notify_url,
   })
 
   const checkOrder = (obj) => {
@@ -892,6 +895,13 @@ exports.mp_pay = async (ctx) => {
     if (payResult.trade_state_desc === '支付成功') {
       return ctx.SUCCESS('ok')
     }
+    if (payResult.return_msg) {
+      throw new Error(
+        payResult.return_msg === '签名错误，请检查后再试'
+          ? payResult.return_msg + '（商户号/APIv2/关联）'
+          : payResult.return_msg
+      )
+    }
     throw new Error(`支付失败，请重试`)
   }
   return ctx.SUCCESS({

package/package.json

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