q-koa 10.7.3 → 10.7.6

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

@@ -474,11 +474,50 @@ exports.dashboard = async (ctx) => {
   ctx.SUCCESS(result)
 }
 
+exports.showAllModel = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { is_count = false } = ctx.request.body
+  const result = await app.sequelize.showAllSchemas()
+  const list = result.map(
+    (item) => item[`Tables_in_${app.sequelize.config.database}`]
+  )
+  let tableList = []
+  for (let i = 0; i < list.length; i++) {
+    if (!app.model[list[i]]) continue
+    const defaultConfigPath = path.resolve(__dirname, `../${list[i]}/config.js`)
+    const defaultConfigExist = fs.existsSync(defaultConfigPath)
+    const target =
+      app.config[list[i]] &&
+      Object.keys(app.config[list[i]]).length === 0 &&
+      defaultConfigExist
+        ? require(defaultConfigPath)
+        : app.config[list[i]]
+    let count = 0
+    if (is_count) {
+      count = await app.model[list[i]].count()
+    }
+    tableList = [
+      ...tableList,
+      {
+        count,
+        name: target.name,
+        model: list[i],
+        count,
+      },
+    ]
+  }
+  return ctx.SUCCESS(
+    tableList.map((item) => lodash.omit(item, is_count ? [] : ['count']))
+  )
+}
+
 exports.drop = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
 
   const result = await app.sequelize.showAllSchemas()
-  const list = result.map((item) => item[`Tables_in_${appName}`])
+  const list = result.map(
+    (item) => item[`Tables_in_${app.sequelize.config.database}`]
+  )
   const filterList = list.filter((item) => !app.model[item])
   await Promise.all(
     filterList.map((folder) => {
@@ -542,7 +581,9 @@ exports.copyOther = async (ctx) => {
       list = [model]
     } else {
       const result = await app.sequelize.showAllSchemas()
-      list = result.map((item) => item[`Tables_in_${appName}`])
+      list = result.map(
+        (item) => item[`Tables_in_${app.sequelize.config.database}`]
+      )
     }
   }
 

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

@@ -862,6 +862,87 @@ exports.pc_pay = async (ctx) => {
   return ctx.SUCCESS(result)
 }
 
+exports.app_pay = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const {
+    name,
+    order_id,
+    price,
+    return_url,
+    prefix = '',
+    type,
+    out_trade_no: _out_trade_no,
+    is_admin = false,
+    config = 'weixin_mp',
+    pay_config = 'weixin_pay',
+  } = ctx.request.body
+
+  if (price === 0) throw new Error('价格不能为0')
+
+  // if (
+  //   !ctx.request[`${appName}-user`] ||
+  //   !ctx.request[`${appName}-user`].open_user
+  // ) {
+  //   throw new Error('请先微信登录')
+  // }
+  const appConfig = getConfig(app)
+
+  const { mchId, key, partner_key, appId: appid } = await appConfig.getObject(
+    pay_config
+  )
+
+  if (!appid) throw new Error(`appId不能存在`)
+
+  const { is_dev, site_host } = await appConfig.getObject('base')
+
+  const wxpay = WXPay({
+    appid,
+    mch_id: mchId,
+    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+  })
+
+  const out_trade_no = _out_trade_no
+    ? _out_trade_no
+    : prefix
+    ? `${key.length > 10 ? appName : key}_${prefix}-${order_id}_${type}`
+    : `${key.length > 10 ? appName : key}_${order_id}_${type}`
+
+  const notify_url = `https://${
+    site_host || 'api.kuashou.com'
+  }/${appName}/weixin/notify`
+
+  const result = await wxpay.appPaySync({
+    trade_type: 'APP',
+    body: name,
+    detail: '公众号支付测试',
+    out_trade_no,
+    total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
+    spbill_create_ip: '192.168.2.210',
+    notify_url,
+  })
+
+  const {
+    noncestr,
+    package,
+    paySign: sign,
+    timestamp,
+    partnerid,
+    prepayid,
+  } = result
+
+  const returnObj = {
+    appid,
+    partnerid,
+    noncestr,
+    package,
+    prepayid,
+    sign,
+    timestamp,
+  }
+
+  return ctx.SUCCESS(returnObj)
+}
+
 exports.mp_pay = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.7.3",
+  "version": "10.7.6",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -52,7 +52,7 @@
     "sequelize": "^5.21.3",
     "static-koa-router": "^1.0.3",
     "wechat-oauth": "^1.5.0",
-    "weixin-pay-fork": "^1.0.4",
+    "weixin-pay-fork": "^1.0.6",
     "node-uuid": "^1.4.8",
     "sha1": "^1.1.1",
     "redis": "^4.0.3",