q-koa 7.8.4 → 7.9.0

package/core/app.js

@@ -1736,6 +1736,9 @@ APP.moment = moment
 global.moment = moment
 global.Sequelize = Sequelize
 global.lodash = _
+
+APP.sleep = (time) => new Promise((resolve) => setTimeout(resolve, time * 1000))
+
 APP.getService = (name) => {
   const target = require(path.resolve(__dirname, `./file/services/${name}`))
   return target

package/core/config.js

@@ -81,6 +81,7 @@ module.exports = {
       $neq: Sequelize.Op.ne,
       $eq: Sequelize.Op.eq,
       $like: Sequelize.Op.like,
+      $notLike: Sequelize.Op.notLike,
       $or: Sequelize.Op.or,
       $and: Sequelize.Op.and,
       $gt: Sequelize.Op.gt,

package/core/file/plugins/cache/config.js

@@ -0,0 +1,19 @@
+module.exports = {
+  name: '缓存',
+  belongs: 'auth',
+  multiple: false,
+  availableSort: false,
+  order: [],
+  select: [],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [],
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  initList: [],
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  deleteCheckList: [],
+}

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

@@ -0,0 +1,24 @@
+const { Sequelize, Random } = require('q-koa')
+
+exports.key = {
+  type: Sequelize.STRING,
+  comment: 'key',
+  allowNull: false,
+  is_mock: true,
+  unique: true,
+  sortOrder: 1,
+  mock: () => Random.ctitle(),
+}
+
+exports.result = {
+  type: Sequelize.JSON,
+  comment: '结果',
+  allowNull: false,
+  is_mock: false,
+  sortOrder: 2,
+  get: function () {
+    return this.getDataValue('result') === null
+      ? null
+      : this.getDataValue('result')
+  },
+}

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

@@ -166,6 +166,8 @@ exports.showTables = async (ctx) => {
       autoData: lodash.get(target, 'autoData', null),
       // 有些model需要前置查询其它model数据
       initList: lodash.get(target, 'initList', []),
+      // 批量修改
+      bulkCreateList: lodash.get(target, 'bulkCreateList', []),
       // 局部更新列表
       editInline: lodash.get(target, 'editInline', {}),
       // 有些model需要前置查询其它model数据
@@ -174,6 +176,8 @@ exports.showTables = async (ctx) => {
       modelQuery: lodash.get(target, 'modelQuery', {}),
       // 删除时检查是不是含有
       deleteCheckList: lodash.get(target, 'deleteCheckList', []),
+      // 批量更新字段
+      bulkCreateList: lodash.get(target, 'bulkCreateList', []),
     }
   })
 

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

@@ -1,6 +1,7 @@
 const { getConfig, lodash } = require('q-koa')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')
+const { is } = require('cheerio/lib/api/traversing')
 
 exports.initData = async ({ includes, excludes, app, ctx }) => {
   const appConfig = getConfig(app)
@@ -77,8 +78,68 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
               }
             })
           } else if (app.model[model]) {
-            return app.model[model][fn]
-              ? app.model[model][fn]({
+            if (app.model[model][fn]) {
+              if (
+                data &&
+                data.cache_level &&
+                data.cache_level === 2 &&
+                app.model.cache
+              ) {
+                return app.model.cache
+                  .findOne({
+                    where: {
+                      key: JSON.stringify({
+                        order,
+                        limit,
+                        include: myInclude,
+                        ...data,
+                      }),
+                    },
+                  })
+                  .then((res) => {
+                    if (res && res.result) {
+                      console.log(`${model}有cache`)
+                      return Promise.resolve({
+                        [item]: res.result,
+                      })
+                    } else {
+                      return app.model[model][fn]({
+                        order,
+                        limit,
+                        include: myInclude,
+                        ...data,
+                      }).then((result) => {
+                        const list =
+                          data && data.omit && Array.isArray(data.omit)
+                            ? result.map((obj) => {
+                                return lodash.omit(obj.toJSON(), data.omit)
+                              })
+                            : result
+                        if (
+                          data &&
+                          data.cache_level &&
+                          data.cache_level === 2 &&
+                          list.length > 0
+                        ) {
+                          app.model.cache &&
+                            app.model.cache.create({
+                              key: JSON.stringify({
+                                order,
+                                limit,
+                                include: myInclude,
+                                ...data,
+                              }),
+                              result: list,
+                            })
+                        }
+                        return {
+                          [item]: list,
+                        }
+                      })
+                    }
+                  })
+              } else {
+                return app.model[model][fn]({
                   order,
                   limit,
                   include: myInclude,
@@ -90,13 +151,39 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
                           return lodash.omit(obj.toJSON(), data.omit)
                         })
                       : result
+                  if (
+                    data &&
+                    data.cache_level &&
+                    data.cache_level === 1 &&
+                    list.length > 0
+                  ) {
+                    app.model.cache &&
+                      app.model.cache.update(
+                        {
+                          result: list,
+                        },
+                        {
+                          where: {
+                            key: JSON.stringify({
+                              order,
+                              limit,
+                              include: myInclude,
+                              ...data,
+                            }),
+                          },
+                        }
+                      )
+                  }
                   return {
                     [item]: list,
                   }
                 })
-              : Promise.resolve({
-                  [item]: [],
-                })
+              }
+            } else {
+              return Promise.resolve({
+                [item]: [],
+              })
+            }
           } else {
             return Promise.resolve({
               [item]: [],

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

@@ -4,15 +4,32 @@ const { getAppByCtx, getConfig } = require('q-koa')
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { mobile, password, ...rest } = ctx.request.body
+  const where =
+    process.env.NODE_ENV !== 'production'
+      ? {
+          $or: [
+            {
+              mobile,
+              password: [md5(password), password],
+              ...rest,
+            },
+            {
+              id: mobile,
+              password: [md5(password), password],
+              ...rest,
+            },
+          ],
+        }
+      : {
+          mobile,
+          password: [md5(password), password],
+          ...rest,
+        }
+
   let result = await app.model.user.findOne({
-    where: {
-      mobile,
-      password: [md5(password), password],
-      ...rest,
-    },
+    where,
   })
   if (!result) throw new Error('账号密码错误')
-  console.log('user==>', ctx.request[`${appName}-user`])
   if (
     ctx.request[`${appName}-user`] &&
     ctx.request[`${appName}-user`].mp_user

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

@@ -998,3 +998,53 @@ exports.article = async (ctx) => {
 
   return ctx.SUCCESS(result)
 }
+
+exports.checkPay = async (ctx) => {
+  const { app, appName, controller } = getAppByCtx(ctx)
+
+  const { id, prefix } = ctx.request.body
+
+  const orderModel = prefix ? `${prefix}_order` : 'order'
+  const result = await app.model[orderModel].findOne({
+    where: {
+      id,
+    },
+  })
+  if (!result) return ctx.SUCCESS('找不到')
+
+  const appConfig = getConfig(app)
+  const app_id = (await appConfig.getObject('weixin_mp')).app_id
+  const { mchId, key } = await appConfig.getObject('weixin_pay')
+
+  const wxpay = WXPay({
+    appid: app_id,
+    mch_id: mchId,
+    partner_key: key, // 微信商户平台API密钥
+  })
+
+  const checkOrder = (obj) => {
+    return new Promise((resolve, reject) => {
+      wxpay.queryOrder(obj, function (err, order) {
+        if (err) throw new Error(err)
+        resolve(order)
+      })
+    })
+  }
+  const orderPrefix = prefix ? `${prefix}-` : ''
+  const out_trade_no = `${appName}_${orderPrefix}${id}_MP-WEIXIN`
+  const payResult = await checkOrder({
+    out_trade_no,
+  })
+
+  if (payResult.trade_state_desc === '支付成功') {
+    const order_price = Number(payResult.total_fee) / 100
+    await app.service[orderModel].notify({
+      app,
+      order: orderModel,
+      order_id: id,
+      order_price,
+    })
+  }
+
+  ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
+}

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

@@ -91,7 +91,7 @@ exports.cash = async ({ ctx, id, user_id, number }) => {
   if (!user) throw new Error('找不到该用户')
   if (!user.mp_user.openid) throw new Error('找不到该用户openid')
 
-  const amount = Math.abs(number) * 100
+  const amount = Number((Math.abs(number) * 100).toFixed(0))
 
   const result = await payObj.transfers({
     partner_trade_no: `${id}`,

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

@@ -108,3 +108,14 @@ exports.sendMessage = async (ctx) => {
   }
   await new Validator(params).validate(ctx.request.body)
 }
+
+exports.checkPay = async (ctx) => {
+  const params = {
+    id: {
+      type: 'number',
+      required: true,
+      message: 'id不能未空',
+    },
+  }
+  await new Validator(params).validate(ctx.request.body)
+}

package/core/file/services/express.js

@@ -28,7 +28,12 @@ module.exports = class Singleton {
         Authorization: `APPCODE ${this.config.app_code}`,
       },
     }).then((res) => res.data)
-    return result.result
+
+    if (result.msg === 'ok') {
+      return result.result
+    } else {
+      throw new Error(result.msg)
+    }
   }
 
   getConfig() {

package/package.json

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