q-koa 13.1.7 → 13.1.9

package/core/app.js

@@ -22,7 +22,7 @@ const util = require('util')
 const jwt = require('jsonwebtoken')
 const verify = util.promisify(jwt.verify)
 const fsExtra = require('fs-extra')
-const { getObject, getAppConfig } = require('./file/utils')
+const { getObject, getAppConfig, formatLiteralObj } = require('./file/utils')
 
 const restc = require('./restc')
 const APP_DIR = 'app'
@@ -288,6 +288,18 @@ class APP {
           )} server is running at http://localhost:${this.port}`
         )
         if (is_dev) {
+          const db_name = _.get(this.app[appName], 'sequelize.config.database')
+          this.app[appName].model.setting.update(
+            {
+              value: db_name,
+            },
+            {
+              where: {
+                code: 'db_name',
+              },
+            }
+          )
+
           console.log(
             `first app is http://localhost:3001/${appName}/setting/findOne`
           )
@@ -1157,57 +1169,6 @@ class APP {
 
           if (where) {
             if (fn === 'findAndCountAll') {
-              const $lt = {
-                check: (param) => typeof param === 'string',
-                result: (param, key) => {
-                  return {
-                    [key]: Sequelize.literal(param[key]),
-                  }
-                },
-              }
-              const $in = {
-                check: (param) => typeof param === 'string',
-                result: (param, key) => {
-                  return {
-                    [key]: [Sequelize.literal(param[key])],
-                  }
-                },
-              }
-              const $between = {
-                check: (param) =>
-                  Array.isArray(param) &&
-                  param.every((p) => p.includes('now()')),
-                result: (param, key) => {
-                  return {
-                    [key]: param[key].map(Sequelize.literal),
-                  }
-                },
-              }
-              const mapper = {
-                $between,
-                notBetween: $between,
-                $lt,
-                $lte: $lt,
-                $gt: $lt,
-                $gte: $lt,
-                $in,
-                $notIn: $in,
-              }
-              const formatObj = (target) => {
-                for (const key of Object.keys(mapper)) {
-                  if (Object.hasOwnProperty.call(target, key)) {
-                    if (mapper[key].check(target[key])) {
-                      return mapper[key].result(target, key)
-                    } else {
-                      return target
-                    }
-                  } else {
-                    continue
-                  }
-                }
-                return target
-              }
-
               if (
                 where.hasOwnProperty('id') &&
                 typeof where.id === 'string' &&
@@ -1222,7 +1183,7 @@ class APP {
 
               const formatWhere = _.mapValues(where, (item) => {
                 if (!_.isObject(item)) return item
-                return formatObj(item)
+                return formatLiteralObj(item)
               })
               _where = _.cloneDeep(formatWhere)
             } else {
@@ -1282,12 +1243,12 @@ class APP {
                     return {
                       ...item,
                       where: {
-                        ...item.where,
                         ...(includeWhere[item.model.getName()]
                           ? {
                               ...includeWhere[item.model.getName()],
                             }
                           : {}),
+                        ...item.where,
                       },
                     }
                   })
@@ -2091,6 +2052,7 @@ APP.Validator = Validator
 APP.ServiceError = ServiceError
 APP.TransactionError = TransactionError
 APP.moment = moment
+APP.utils = require('./file/utils')
 APP.is_dev = is_dev
 
 global.moment = moment

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

@@ -309,7 +309,9 @@ exports.getTable = async (ctx) => {
     return ctx.SUCCESS(app.cache.get(`${_model}-table`))
   }
 
-  const model = app.config[_model].model || _model
+  const model = (app.config[_model] && app.config[_model].model) || _model
+
+  if (!app.config[model]) return ctx.SUCCESS(null)
 
   const _result = await app.sequelize.getQueryInterface().describeTable(model)
 

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

@@ -1,4 +1,5 @@
-const { getConfig, lodash, Sequelize } = require('q-koa')
+const { getConfig, lodash } = require('q-koa')
+const { formatLiteralObj } = require('../../utils')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')
 const axios = require('axios')
@@ -33,6 +34,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
             excludeInclude,
             autoInclude = true,
             is_cache = false,
+            defaultValue,
           } = route
 
           if (url.includes('http')) {
@@ -134,8 +136,14 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
 
           if (app.controller[model] && app.controller[model][fn]) {
             return app.controller[model][fn](ctx, data).then((result) => {
-              if (!result && process.env.NODE_ENV !== 'production') {
+              if (
+                result === undefined &&
+                process.env.NODE_ENV !== 'production'
+              ) {
                 console.error(`需要在控制器${fn}中返回`)
+                return {
+                  [item]: defaultValue || result,
+                }
               }
               return {
                 [item]: result,
@@ -208,49 +216,15 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
                   data &&
                   lodash.isObject(data) &&
                   data.hasOwnProperty('where')
-                    ? Object.keys(data).reduce((a, b) => {
-                        return {
-                          ...a,
-                          ...(b === 'where'
-                            ? {
-                                [b]: Object.keys(data[b]).reduce((_a, _b) => {
-                                  return {
-                                    ..._a,
-                                    ...(['$gt', '$lt'].some((i) =>
-                                      data[b][_b].hasOwnProperty(i)
-                                    )
-                                      ? {
-                                          [_b]: data[b][_b],
-                                          ...(typeof data[b][_b].$gt ===
-                                            'string' &&
-                                          data[b][_b].hasOwnProperty('$gt')
-                                            ? {
-                                                [_b]: {
-                                                  $gt: Sequelize.literal(
-                                                    data[b][_b].$gt
-                                                  ),
-                                                },
-                                              }
-                                            : {}),
-                                          ...(typeof data[b][_b].$lt ===
-                                            'string' &&
-                                          data[b][_b].hasOwnProperty('$lt')
-                                            ? {
-                                                [_b]: {
-                                                  $lt: Sequelize.literal(
-                                                    data[b][_b].$lt
-                                                  ),
-                                                },
-                                              }
-                                            : {}),
-                                        }
-                                      : { [_b]: data[b][_b] }),
-                                  }
-                                }, {}),
-                              }
-                            : { [b]: data[b] }),
+                    ? lodash.mapValues(data, (value, key) => {
+                        if (key === 'where') {
+                          return lodash.mapValues(data.where, (item) => {
+                            if (!lodash.isObject(item)) return item
+                            return formatLiteralObj(item)
+                          })
                         }
-                      }, {})
+                        return value
+                      })
                     : data
                 // console.log('formatData', data, '-->', formatData)
                 return app.model[model][fn]({

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

@@ -6,7 +6,20 @@ module.exports = {
   availableSort: false,
   order: [],
   referenceSelect: [],
-  select: ['id', 'code', 'name', 'is_front', 'is_cache', 'is_control', 'extra'],
+  select: [
+    'id',
+    'code',
+    'name',
+    'is_front',
+    'is_cache',
+    'is_control',
+    {
+      key: 'extra',
+      extra: {
+        list: ['is_admin', 'is_purchase', 'is_custom', 'is_supply'],
+      },
+    },
+  ],
   excludes: [],
   limit: 20,
   defaultOrder: [],

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

@@ -4,6 +4,7 @@ const {
   getConfig,
   lodash,
   moment,
+  sleep,
 } = require('q-koa')
 const { Pay } = require('@sigodenjs/wechatpay')
 const WXPay = require('weixin-pay-fork')
@@ -480,13 +481,23 @@ exports.handleUserMessage = async ({ app, result }) => {
       secrect: app_secrect,
     })
     weixinMp.init()
+    const touser = result.FromUserName
+    await weixinMp.handleTyping({
+      touser,
+      is_typing: true,
+    })
+    await sleep(3)
     await weixinMp.handleMessage({
-      touser: result.FromUserName,
+      touser,
       msgtype: 'text',
       text: {
         content: `你说${result.Content},是吗？`,
       },
     })
+    await weixinMp.handleTyping({
+      touser,
+      is_typing: false,
+    })
   }
 }
 

package/core/file/services/weixinMP.js

@@ -20,6 +20,8 @@ const sendMessageUrl =
   'https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=%s'
 const handleMessageUrl =
   'https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=%s'
+const handleTypingUrl =
+  'https://api.weixin.qq.com/cgi-bin/message/custom/typing?access_token=%s'
 const uploadFile =
   'https://api.weixin.qq.com/cgi-bin/media/upload?access_token=%s&type=%s'
 const serviceMarketUrl =
@@ -558,6 +560,24 @@ module.exports = class Singleton {
     return result
   }
 
+  async handleTyping({ touser, is_typing = true }) {
+    const options = {
+      touser,
+      command: is_typing ? 'Typing' : 'CancelTyping',
+    }
+    const access_token = await this.getAccessToken()
+    const url = util.format(handleTypingUrl, access_token)
+    const result = await axios.post(url, options).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.handleTyping(options)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
   async uploadFile(imgUrl) {
     if (!imgUrl || !imgUrl.includes('//')) throw new Error('检查imgUrl是否链接')
 

package/core/file/utils/index.js

@@ -1,5 +1,7 @@
 const { lodash } = require('q-koa')
+const Sequelize = require('sequelize')
 const md5 = require('md5')
+const moment = require('moment')
 
 const findConfig = (type) => (item) =>
   item.key === type ||
@@ -205,3 +207,124 @@ exports.signResult = (params, salt) => {
   var signStr = paramArray.join('&')
   return md5(signStr)
 }
+
+function isDateTime(str) {
+  const dateRegex = /^[\u4e00-\u9fa5]{4}-[\u4e00-\u9fa5]{2}-[\u4e00-\u9fa5]{2}$/
+  return dateRegex.test(str)
+}
+
+const $lt = {
+  check: (param) => typeof param === 'string',
+  result: (param, key) => {
+    return {
+      [key]: Sequelize.literal(param[key]),
+    }
+  },
+}
+const $in = {
+  check: (param) => typeof param === 'string',
+  result: (param, key) => {
+    return {
+      [key]: [Sequelize.literal(param[key])],
+    }
+  },
+}
+const $between = {
+  check: (param) =>
+    Array.isArray(param) && param.every((p) => typeof param === 'string'),
+  result: (param, key) => {
+    return {
+      [key]: param[key].map(Sequelize.literal),
+    }
+  },
+}
+const mapper = {
+  $between,
+  notBetween: $between,
+  $lt,
+  $lte: $lt,
+  $gt: $lt,
+  $gte: $lt,
+  $in,
+  $notIn: $in,
+}
+
+exports.formatLiteralObj = (target) => {
+  for (const key of Object.keys(mapper)) {
+    if (Object.hasOwnProperty.call(target, key)) {
+      if (mapper[key].check(target[key])) {
+        return mapper[key].result(target, key)
+      } else {
+        return target
+      }
+    } else {
+      continue
+    }
+  }
+  return target
+}
+
+exports.filterFunction = (target, data) => {
+  if (!target) {
+    console.error(`target为null`)
+    return false
+  }
+  return Object.keys(target).every((key) => {
+    if (key.includes('.')) {
+      return lodash.get(data, key) === target[key]
+    }
+    if (typeof target[key] === 'boolean') {
+      return Boolean(data[key]) === target[key]
+    }
+    if (Array.isArray(target[key])) {
+      return target[key].includes(data[key])
+    }
+    if (lodash.isObject(target[key])) {
+      if (Object.prototype.hasOwnProperty.call(target[key], '$gt')) {
+        if (key.endsWith('time') || key.endsWith('_at')) {
+          return moment(data[key]).diff(moment(target[key].$gt), 'seconds') > 0
+        }
+        return data[key] > target[key].$gt
+      } else if (Object.prototype.hasOwnProperty.call(target[key], '$gte')) {
+        if (key.endsWith('time') || key.endsWith('_at')) {
+          return moment(data[key]).diff(moment(target[key].$gt), 'seconds') >= 0
+        }
+        return data[key] >= target[key].$gte
+      } else if (Object.prototype.hasOwnProperty.call(target[key], '$lt')) {
+        if (key.endsWith('time') || key.endsWith('_at')) {
+          return moment(target[key].$gt).diff(moment(data[key]), 'seconds') < 0
+        }
+        return data[key] < target[key].$lt
+      } else if (Object.prototype.hasOwnProperty.call(target[key], '$lte')) {
+        if (key.endsWith('time') || key.endsWith('_at')) {
+          return moment(target[key].$gt).diff(moment(data[key]), 'seconds') <= 0
+        }
+        return data[key] <= target[key].$lte
+      } else if (Object.prototype.hasOwnProperty.call(target[key], '$notIn')) {
+        return !target[key].$notIn.includes(data[key])
+      } else if (Object.prototype.hasOwnProperty.call(target[key], '$in')) {
+        return target[key].$in.includes(data[key])
+      } else if (
+        Object.prototype.hasOwnProperty.call(target[key], '$between')
+      ) {
+        if (
+          !Array.isArray(target[key].$between) ||
+          target[key].$between.length !== 2
+        ) {
+          throw new Error(`$between example : [2,5]`)
+        }
+        const min = target[key].$between[0]
+        const max = target[key].$between[1]
+        return data[key] >= min && data[key] <= max
+      } else if (Object.prototype.hasOwnProperty.call(target[key], '$ne')) {
+        return data[key] !== target[key].$ne
+      } else if (Object.prototype.hasOwnProperty.call(target[key], '$neq')) {
+        return data[key] !== target[key].$neq
+      } else if (Object.prototype.hasOwnProperty.call(target[key], '$eq')) {
+        return data[key] === target[key].$eq
+      }
+      return data[key] === target[key]
+    }
+    return data[key] === target[key]
+  })
+}

package/package.json

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