q-koa 10.7.4 → 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

@@ -879,12 +879,12 @@ exports.app_pay = async (ctx) => {
 
   if (price === 0) throw new Error('价格不能为0')
 
-  if (
-    !ctx.request[`${appName}-user`] ||
-    !ctx.request[`${appName}-user`].open_user
-  ) {
-    throw new Error('请先微信登录')
-  }
+  // 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(
@@ -911,7 +911,7 @@ exports.app_pay = async (ctx) => {
     site_host || 'api.kuashou.com'
   }/${appName}/weixin/notify`
 
-  const result = await wxpay.getBrandWCPayRequestParamsSync({
+  const result = await wxpay.appPaySync({
     trade_type: 'APP',
     body: name,
     detail: '公众号支付测试',
@@ -922,19 +922,21 @@ exports.app_pay = async (ctx) => {
   })
 
   const {
-    nonceStr: nonce_str,
-    package: prepay_id,
+    noncestr,
+    package,
     paySign: sign,
-    timeStamp: timestamp,
+    timestamp,
+    partnerid,
+    prepayid,
   } = result
 
   const returnObj = {
     appid,
-    partnerid: mchId,
-    nonce_str,
-    prepay_id,
+    partnerid,
+    noncestr,
+    package,
+    prepayid,
     sign,
-    return_url,
     timestamp,
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.7.4",
+  "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.5",
+    "weixin-pay-fork": "^1.0.6",
     "node-uuid": "^1.4.8",
     "sha1": "^1.1.1",
     "redis": "^4.0.3",