q-koa 13.1.6 → 13.1.8

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'
@@ -1157,57 +1157,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 +1171,7 @@ class APP {
 
               const formatWhere = _.mapValues(where, (item) => {
                 if (!_.isObject(item)) return item
-                return formatObj(item)
+                return formatLiteralObj(item)
               })
               _where = _.cloneDeep(formatWhere)
             } else {

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

@@ -27,7 +27,6 @@ exports.login = async (ctx) => {
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,

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

@@ -150,7 +150,6 @@ exports.login_callback = async (ctx) => {
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     h5_user: result.h5_user
       ? {
           openid: result.h5_user && result.h5_user.openid,

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')
@@ -208,49 +209,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/toutiao/controller.js

@@ -161,12 +161,9 @@ exports.login = async (ctx) => {
     ],
   })
 
-  console.log('result', result, app.include.user)
-
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,

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

@@ -42,7 +42,6 @@ exports.login = async (ctx) => {
     const tokenResult = {
       id: result.id,
       name: result.name,
-      mobile: result.mobile,
     }
     const token = await app.sign({
       user: tokenResult,
@@ -194,7 +193,6 @@ exports.login = async (ctx) => {
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -433,7 +431,6 @@ exports.checkLogin = async (ctx) => {
     const tokenResult = {
       id: result.id,
       name: result.name,
-      mobile: result.mobile,
       mp_user: result.mp_user
         ? {
             openid: result.mp_user && result.mp_user.openid,

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

@@ -131,7 +131,6 @@ exports.mp_getPhone = async (ctx) => {
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -253,7 +252,6 @@ exports.mp_getPhoneNew = async (ctx) => {
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -495,7 +493,6 @@ exports.mp_login = async (ctx) => {
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -675,7 +672,6 @@ exports.h5_login_callback = async (ctx) => {
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -810,7 +806,6 @@ exports.h5_login_info_callback = async (ctx) => {
   const tokenResult = {
     id: result.id,
     name: result.name,
-    mobile: result.mobile,
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,

package/core/file/utils/index.js

@@ -1,4 +1,5 @@
 const { lodash } = require('q-koa')
+const Sequelize = require('sequelize')
 const md5 = require('md5')
 
 const findConfig = (type) => (item) =>
@@ -205,3 +206,54 @@ exports.signResult = (params, salt) => {
   var signStr = paramArray.join('&')
   return md5(signStr)
 }
+
+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,
+}
+
+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
+}

package/package.json

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