q-koa 13.2.9 → 13.3.1

package/core/app.js

@@ -286,10 +286,11 @@ class APP {
         typeof this.config.includes[0] === 'string'
           ? this.config.includes[0]
           : this.config.includes[0].app
-      if (!this.app[appName])
+      if (!this.app[appName]) {
         throw new Error(
           `没有生成应用${this.config.includes[0]}，请检查config includes`
         )
+      }
       this.server = this.app.listen(this.port, () => {
         console.log(
           `${moment().format(
@@ -518,9 +519,8 @@ class APP {
             this.app[appName].service.log.push({
               app: this.app[appName],
               appName,
-              message: e.message,
+              message: e.stack,
             })
-          console.log(e.message)
         }
       }
 
@@ -851,8 +851,8 @@ class APP {
 
       list.forEach((model1) => {
         if (this.app[appName].attributes[model][`${model1}_id`].belongsTo) {
-          const myModel = this.app[appName].attributes[model][`${model1}_id`]
-            .belongsTo
+          const myModel =
+            this.app[appName].attributes[model][`${model1}_id`].belongsTo
           this.app[appName].model[model].belongsTo(
             this.app[appName].model[myModel],
             {
@@ -976,7 +976,13 @@ class APP {
           if (ctx.app[appName].redisClient) {
             ctx.app[appName].redisClient.publish('cache clear', `${controller}`)
           } else {
-            ctx.app[appName].cache.set(`${controller}`, null)
+            // ctx.app[appName].cache.set(`${controller}`, null)
+            ctx.app[appName].service.cache &&
+              ctx.app[appName].service.cache.init({
+                app: ctx.app[appName],
+                appName,
+                model: controller,
+              })
           }
         }
       }
@@ -1103,8 +1109,9 @@ class APP {
             const strInclude = postInclude(app[appName])
             // const postInclude = include.toFunction();
 
-            if (!Array.isArray(strInclude))
-              throw new Error(`可能include不是一个数组`)
+            if (!Array.isArray(strInclude)) {
+              throw new Error('可能include不是一个数组')
+            }
 
             myInclude =
               app[appName] &&
@@ -1654,9 +1661,8 @@ class APP {
                         app[appName].attributes[modelName] &&
                         app[appName].attributes[modelName][controller + '_id']
                       ) {
-                        const { required, include, where, ...rest } = myInclude[
-                          j
-                        ]
+                        const { required, include, where, ...rest } =
+                          myInclude[j]
                         const list = await model.findAll({
                           where: {
                             [controller + '_id']: target.id,
@@ -1959,7 +1965,13 @@ class APP {
                 `${controller}`
               )
             } else {
-              ctx.app[appName].cache.set(`${controller}`, null)
+              // ctx.app[appName].cache.set(`${controller}`, null)
+              ctx.app[appName].service.cache &&
+                ctx.app[appName].service.cache.init({
+                  app: ctx.app[appName],
+                  appName,
+                  model: controller,
+                })
             }
           }
         }
@@ -1974,8 +1986,6 @@ class APP {
             (ctx.request[`${appName}-user`] &&
               ((ctx.request[`${appName}-user`].name &&
                 ctx.request[`${appName}-user`].name === 'admin') ||
-                (ctx.request[`${appName}-user`].mobile &&
-                  ctx.request[`${appName}-user`].mobile === '18978909244') ||
                 ctx.request[`${appName}-user`].is_admin ||
                 ctx.request[`${appName}-user`].is_dev))
               ? ['updated_at']
@@ -2018,7 +2028,13 @@ class APP {
                 `${controller}`
               )
             } else {
-              ctx.app[appName].cache.set(`${controller}`, null)
+              // ctx.app[appName].cache.set(`${controller}`, null)
+              ctx.app[appName].service.cache &&
+                ctx.app[appName].service.cache.init({
+                  app: ctx.app[appName],
+                  appName,
+                  model: controller,
+                })
             }
           }
         }
@@ -2050,7 +2066,13 @@ class APP {
                 `${controller}`
               )
             } else {
-              ctx.app[appName].cache.set(`${controller}`, null)
+              // ctx.app[appName].cache.set(`${controller}`, null)
+              ctx.app[appName].service.cache &&
+                ctx.app[appName].service.cache.init({
+                  app: ctx.app[appName],
+                  appName,
+                  model: controller,
+                })
             }
           }
         }

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

@@ -1,5 +1,7 @@
-exports.init = async ({ app, appName }) => {
-  const cacheModel = app.appConfig.cacheModel
+exports.init = async ({ app, appName, model = '' }) => {
+  const cacheModel = app.appConfig.cacheModel.filter((m) =>
+    model ? m === model : true
+  )
 
   const promiseFn = async (model) => {
     const result = await app.model[model].findAll({

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

@@ -8,5 +8,5 @@ module.exports = {
   defaultOrder: [],
   comment: {},
   reference: [],
-  
-};
+  indexList: [{ fields: ['model_id'] }],
+}

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

@@ -80,14 +80,53 @@ exports.countAndMaxId = async (ctx, _data) => {
     return null
   }
   const count = await app.model[model].count()
-  const result = await app.model[model].findOne({
+  const current = await app.model[model].findOne({
+    attributes: ['id', 'created_at'],
+    order: [['id', 'DESC']],
+  })
+
+  const current_max_id = current ? current.id : 0
+
+  const lastMonth = await app.model[model].findOne({
     attributes: ['id'],
+    where: {
+      created_at: {
+        $lt: moment().add(-1, 'months'),
+      },
+    },
     order: [['id', 'DESC']],
   })
 
+  const last_month_id = lastMonth ? lastMonth.id : 0
+
+  const _result = await app.sequelize.getQueryInterface().describeTable(model)
+  const type = _result.id.type
+
+  const mapper = {
+    TINYINT: 255,
+    SMALLINIT: 65535,
+    MEDIUMINT: 16777215,
+    INT: 4294967295,
+  }
+  let availableId = 0
+  for (const _type in mapper) {
+    if (type.startsWith(_type)) {
+      availableId = mapper[_type]
+    }
+  }
+
+  let availableMonth = 10000
+  const month_diff = current_max_id - last_month_id
+
+  if (month_diff) {
+    availableMonth = Math.floor((availableId - current_max_id) / month_diff)
+  }
+
   const payLoad = {
     count,
-    max_id: result ? result.id : 0,
+    current_max_id,
+    availableId,
+    availableMonth,
   }
 
   ctx.SUCCESS(payLoad)
@@ -109,8 +148,9 @@ exports.initModel = async (ctx) => {
   const appConfig = getConfig(app)
   if (Array.isArray(model)) {
     const { is_dev } = await appConfig.getObject('base')
-    if (!is_dev && option === 'force')
+    if (!is_dev && option === 'force') {
       throw new Error('正式环境不允许array model force')
+    }
     await Promise.all(model.map((m) => app.model[m].sync(config)))
     return ctx.SUCCESS('ok')
   }
@@ -149,7 +189,7 @@ exports.initModel = async (ctx) => {
           )
           .then((res) => res.data)
         if (code === 200) {
-          const findList = Object.keys(productionModel).filter((key) => {
+          const findList = Object.keys(productionModel || {}).filter((key) => {
             return (
               !['id', 'created_at', 'createdid', 'updated_at'].includes(key) &&
               !Object.keys(app.attributes[model]).includes(key)
@@ -251,7 +291,7 @@ exports.showTables = async (ctx) => {
     if (!target) throw new Error(`检查是否有${_model}/config.js`)
     const model = target.model ? target.model : _model
 
-    function getValueByModelName(target, key, defaultValue, model, _model) {
+    const getValueByModelName = (target, key, defaultValue, model, _model) => {
       return lodash.get(
         target,
         key,
@@ -935,3 +975,58 @@ exports.reset = async (ctx) => {
 
   ctx.SUCCESS(result.length)
 }
+
+exports.changeIdType = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { model } = ctx.request.body
+  if (!model) return ctx.ERROR('?model')
+  if (!app.model[model]) return ctx.ERROR('check model?')
+  const belongs = lodash.get(app.config[model], 'belongs', 'page')
+  const idType = lodash.get(
+    app.config[model],
+    'idType',
+    belongs === 'setting' ? 'TINYINT' : 'MEDIUMINT'
+  )
+
+  const mapper = {
+    INTEGER: 'INT',
+    TINYINT: 'TINYINT',
+    MEDIUMINT: 'MEDIUMINT',
+  }
+  if (!mapper[idType]) return ctx.ERROR(`not accept ${idType}`)
+
+  const col = 'id'
+  const _result = await app.sequelize.getQueryInterface().describeTable(model)
+  const obj = _result[col]
+  const updateTo = `${mapper[idType]} UNSIGNED`
+
+  const query = `ALTER TABLE \`${model}\` MODIFY COLUMN id ${updateTo} NOT NULL AUTO_INCREMENT`
+
+  const target = lodash.pickBy(app.attributes, (obj) => `${model}_id` in obj)
+
+  console.log(`即将更新${model}的ID类型为${updateTo}`)
+  let flag = true
+  for (const _model of Object.keys(target)) {
+    const _res = await app.sequelize.getQueryInterface().describeTable(_model)
+    if (updateTo !== _res[`${model}_id`].type) {
+      console.error(
+        `请先处理好${_model}的字段类型${model}_id，当前是${
+          _res[`${model}_id`].type
+        }`
+      )
+      flag = false
+    }
+  }
+  if (obj.type === updateTo) {
+    return ctx.ERROR('已经是了')
+  }
+
+  if (!flag) {
+    return ctx.ERROR('更新失败')
+  }
+  // ctx.SUCCESS(query)
+
+  const result = await app.sequelize.query(query)
+
+  ctx.SUCCESS(result)
+}

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

@@ -75,6 +75,8 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
             }
           }
           if (is_cache && app.cache && app.cache.get(`${model}`)) {
+            const omit = data && data.omit ? data.omit : []
+            const pick = data && data.pick ? data.pick : []
             const cacheData = app.cache.get(`${model}`) || []
             const cacheList = cacheData
               .map((i) => (i.toJSON ? i.toJSON() : i))
@@ -85,8 +87,6 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
                 })
               })
               .map((c) => {
-                const omit = data && data.omit ? data.omit : []
-                const pick = data && data.pick ? data.pick : []
                 return pick.length > 0
                   ? lodash.pick(c, pick)
                   : lodash.omit(c, omit)
@@ -158,159 +158,71 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
             })
           } else if (app.model[model]) {
             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,
-                        }
-                      })
+              if (data && lodash.isObject(data)) {
+                if (
+                  fn === 'findOne' &&
+                  'attributes' in data &&
+                  Array.isArray(data.attributes) &&
+                  data.attributes.every((attribute) =>
+                    Array.isArray(attribute)
+                  ) &&
+                  data.attributes.some(
+                    (attribute) =>
+                      Array.isArray(attribute) &&
+                      attribute.some((att) => att.startsWith('literal'))
+                  )
+                ) {
+                  return app.model[model][fn]({
+                    where: data.where,
+                    attributes: data.attributes.map((attribute) => {
+                      if (Array.isArray(attribute)) {
+                        return attribute.map((att) => {
+                          if (att.startsWith('literal')) {
+                            return Sequelize.literal(getLiteral(att))
+                          }
+                          return att
+                        })
+                      }
+                      return attribute
+                    }),
+                  }).then((res) => {
+                    return {
+                      [item]: res,
                     }
                   })
-              } else {
-                if (data && lodash.isObject(data)) {
-                  if (
-                    fn === 'findOne' &&
-                    'attributes' in data &&
-                    Array.isArray(data.attributes) &&
-                    data.attributes.every((attribute) =>
-                      Array.isArray(attribute)
-                    ) &&
-                    data.attributes.some(
-                      (attribute) =>
-                        Array.isArray(attribute) &&
-                        attribute.some((att) => att.startsWith('literal'))
-                    )
-                  ) {
-                    return app.model[model][fn]({
-                      where: data.where,
-                      attributes: data.attributes.map((attribute) => {
-                        if (Array.isArray(attribute)) {
-                          return attribute.map((att) => {
-                            if (att.startsWith('literal')) {
-                              return Sequelize.literal(getLiteral(att))
-                            }
-                            return att
-                          })
-                        }
-                        return attribute
-                      }),
-                    }).then((res) => {
-                      return {
-                        [item]: res,
+                }
+              }
+              const formatData =
+                fn === 'findAll' &&
+                data &&
+                lodash.isObject(data) &&
+                data.hasOwnProperty('where')
+                  ? 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
                     })
-                  }
-                }
-                const formatData =
-                  fn === 'findAll' &&
-                  data &&
-                  lodash.isObject(data) &&
-                  data.hasOwnProperty('where')
-                    ? 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]({
+                order,
+                limit,
+                include: myInclude,
+                ...formatData,
+              }).then((result) => {
+                const list =
+                  data && data.omit && Array.isArray(data.omit)
+                    ? result.map((obj) => {
+                        return lodash.omit(obj.toJSON(), data.omit)
                       })
-                    : data
-                // console.log('formatData', data, '-->', formatData)
-                return app.model[model][fn]({
-                  order,
-                  limit,
-                  include: myInclude,
-                  ...formatData,
-                }).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 === 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,
-                  }
-                })
-              }
-            } else {
-              return Promise.resolve({
-                [item]: [],
+                    : result
+                return {
+                  [item]: list,
+                }
               })
             }
           } else {

package/core/file/utils/index.js

@@ -279,7 +279,7 @@ const $in = {
 }
 const $between = {
   check: (param) =>
-    Array.isArray(param) && param.every((p) => typeof param === 'string'),
+    Array.isArray(param) && param.every((p) => typeof p === 'string'),
   result: (param, key) => {
     if (param[key].every((i) => getLiteral(i))) {
       return {
@@ -322,7 +322,7 @@ exports.formatLiteralObj = (target) => {
   return target
 }
 
-exports.filterFunction = (target, data) => {
+const filterFunction = (target, data) => {
   if (!target) {
     return false
   }
@@ -333,6 +333,16 @@ exports.filterFunction = (target, data) => {
     if (typeof target[key] === 'boolean') {
       return Boolean(data[key]) === target[key]
     }
+    if ('$and' in target) {
+      return target.$and.every((item) => {
+        return filterFunction(item, data)
+      })
+    }
+    if ('$or' in target) {
+      return target.$or.some((item) => {
+        return filterFunction(item, data)
+      })
+    }
     if (Array.isArray(target[key])) {
       return target[key].includes(data[key])
     }
@@ -386,3 +396,5 @@ exports.filterFunction = (target, data) => {
     return data[key] === target[key]
   })
 }
+
+exports.filterFunction = filterFunction

package/package.json

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