q-koa 13.0.0 → 13.0.2

package/core/app.js

@@ -22,7 +22,7 @@ const jwt = require('jsonwebtoken')
 const verify = util.promisify(jwt.verify)
 const fsExtra = require('fs-extra')
 const { getObject, getAppConfig } = require('./file/utils')
-const { push } = require('./file/plugins/log/service')
+
 const restc = require('./restc')
 const APP_DIR = 'app'
 const PLUGINS_DIR = 'plugins'
@@ -472,6 +472,8 @@ class APP {
         await this.initModel(appName)
         // const models = Object.keys(this.app[appName].model).join(' / ')
       } catch (e) {
+        const { push } = require('./file/plugins/log/service')
+
         push({
           appName,
           message: `${appName}数据库连接失败`,
@@ -773,7 +775,7 @@ class APP {
       }
     }
     const start = moment().valueOf()
-    for (const fn of ['service', 'controller']) {
+    for (const fn of ['service']) {
       const cloneTarget = this.app[appName][fn]
 
       this.app[appName][fn] = Object.keys(cloneTarget).reduce((a, b) => {
@@ -1152,64 +1154,57 @@ class APP {
 
           if (where) {
             if (fn === 'findAndCountAll') {
-              const formatWhere = _.mapValues(where, (item) => {
-                if (_.isObject(item)) {
-                  if (
-                    item.hasOwnProperty('$notIn') &&
-                    typeof item.$notIn === 'string'
-                  ) {
-                    return {
-                      $notIn: [Sequelize.literal(item.$notIn)],
-                    }
+              const $lt = {
+                check: (param) => typeof param === 'string',
+                result: (param, key) => {
+                  return {
+                    [key]: Sequelize.literal(param[key]),
                   }
-
-                  if (
-                    item.hasOwnProperty('$in') &&
-                    typeof item.$in === 'string'
-                  ) {
-                    return {
-                      $in: [Sequelize.literal(item.$in)],
-                    }
-                  }
-                  if (
-                    item.hasOwnProperty('$lt') &&
-                    typeof item.$lt === 'string'
-                  ) {
-                    return {
-                      $lt: Sequelize.literal(item.$lt),
-                    }
-                  }
-
-                  if (
-                    item.hasOwnProperty('$lte') &&
-                    typeof item.$lte === 'string'
-                  ) {
-                    return {
-                      $lte: Sequelize.literal(item.$lte),
-                    }
+                },
+              }
+              const $in = {
+                check: (param) => typeof param === 'string',
+                result: (param, key) => {
+                  return {
+                    [key]: [Sequelize.literal(param[key])],
                   }
-
-                  if (
-                    item.hasOwnProperty('$gt') &&
-                    typeof item.$gt === 'string'
-                  ) {
-                    return {
-                      $gt: Sequelize.literal(item.$gt),
-                    }
+                },
+              }
+              const $between = {
+                check: (param) => Array.isArray(param),
+                result: (param, key) => {
+                  return {
+                    [key]: param[key].map(Sequelize.literal),
                   }
-
-                  if (
-                    item.hasOwnProperty('$gte') &&
-                    typeof item.$gte === 'string'
-                  ) {
-                    return {
-                      $gte: Sequelize.literal(item.$gte),
+                },
+              }
+              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 item
-                } else {
-                  return item
                 }
+                return target
+              }
+              const formatWhere = _.mapValues(where, (item) => {
+                if (!_.isObject(item)) return item
+                return formatObj(item)
               })
               _where = _.cloneDeep(formatWhere)
             } else {

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

@@ -413,11 +413,9 @@ exports.initDataWithCache = exports.initData = async (ctx) => {
 
   const { is_cache } = await appConfig.getObject('base')
   const { includes, excludes = [] } = ctx.request.body
-
   if (!includes) {
     return ctx.SUCCESS(null)
   }
-
   const cacheTarget = JSON.stringify(ctx.request.body)
 
   let result = null

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

@@ -150,19 +150,29 @@ exports.login = async (ctx) => {
         ].filter((item) => item.model)
       : []
   if (app.appConfig.loginData) {
+    const application = await getAppConfig({ app, config })
+
+    const loginData = lodash.mergeWith(
+      app.appConfig.loginData,
+      lodash.get(application, 'loginData', {}),
+      (objValue, srcValue) => {
+        if (lodash.isArray(objValue)) {
+          return objValue.concat(srcValue)
+        }
+      }
+    )
     const include = includeDefault.filter((i) => {
-      return app.appConfig.loginData.excludeInclude.every((m) => {
+      return loginData.excludeInclude.every((m) => {
         return app.model[m] !== i.model
       })
     })
 
-    const application = await getAppConfig({ app, config })
     const exclude_list = lodash.get(application, 'exclude_list', [])
 
     const attributes = {
       exclude: Array.from(
         new Set([
-          ...app.appConfig.loginData.attributes.exclude,
+          ...loginData.attributes.exclude,
           ...(Array.isArray(exclude_list) ? exclude_list : []),
         ])
       ),
@@ -342,20 +352,31 @@ exports.checkLogin = async (ctx) => {
       },
       ...app.include.user,
     ].filter((item) => item.model)
+
     if (app.appConfig.loginData) {
+      const application = await getAppConfig({ app, config })
+
+      const loginData = lodash.mergeWith(
+        app.appConfig.loginData,
+        lodash.get(application, 'loginData', {}),
+        (objValue, srcValue) => {
+          if (lodash.isArray(objValue)) {
+            return objValue.concat(srcValue)
+          }
+        }
+      )
       const include = includeDefault.filter((i) => {
-        return app.appConfig.loginData.excludeInclude.every((m) => {
+        return loginData.excludeInclude.every((m) => {
           return app.model[m] !== i.model
         })
       })
 
-      const application = await getAppConfig({ app, config })
       const exclude_list = lodash.get(application, 'exclude_list', [])
 
       const attributes = {
         exclude: Array.from(
           new Set([
-            ...app.appConfig.loginData.attributes.exclude,
+            ...loginData.attributes.exclude,
             ...(Array.isArray(exclude_list) ? exclude_list : []),
           ])
         ),

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

@@ -442,12 +442,24 @@ exports.mp_login = async (ctx) => {
   ].filter((item) => item.model)
 
   if (app.appConfig.loginData) {
+    const application = await getAppConfig({ app, config })
+    const loginData = lodash.mergeWith(
+      app.appConfig.loginData,
+      lodash.get(application, 'loginData', {}),
+      (objValue, srcValue) => {
+        if (lodash.isArray(objValue)) {
+          return objValue.concat(srcValue)
+        }
+      }
+    )
     const include = includeDefault.filter((i) => {
-      return app.appConfig.loginData.excludeInclude.every((m) => {
+      return loginData.excludeInclude.every((m) => {
         return app.model[m] !== i.model
       })
     })
-    const { exclude_list = [] } = await getAppConfig({ app, config })
+
+    const exclude_list = lodash.get(application, 'exclude_list', [])
+
     const attributes = {
       exclude: Array.from(
         new Set([
@@ -925,9 +937,12 @@ exports.app_pay = async (ctx) => {
   // }
   const appConfig = getConfig(app)
 
-  const { mchId, key, partner_key, appId: appid } = await appConfig.getObject(
-    pay_config
-  )
+  const {
+    mchId,
+    key,
+    partner_key,
+    appId: appid,
+  } = await appConfig.getObject(pay_config)
 
   if (!appid) throw new Error(`appId不能存在`)
 

package/package.json

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