q-koa 13.2.7 → 13.2.9

package/core/app.js

@@ -55,6 +55,15 @@ const runVm = (_str) => {
   return nodeVm.runInNewContext(_str)
 }
 
+const getLiteral = (str) => {
+  const reg = /literal\((.+)\)/
+  const result = str.match(reg)
+  if (result) {
+    return result[1] // 返回第一个捕获组
+  }
+  return ''
+}
+
 const memRunVm = _.memoize(runVm)
 const connectDatabase = (database) => (config) => {
   if (!database) throw new Error('请配置数据库名称')
@@ -90,7 +99,7 @@ class APP {
       miLimit(config.rateLimit),
       miStatic(config.static),
       miAgent(),
-      miWebsocket(),
+      config.is_websocket ? miWebsocket() : null,
       miCors(config.includes, config.ip),
       // miRestc(config),
       miBody(config.koaBody),
@@ -103,7 +112,7 @@ class APP {
       miResponse(config.response),
       // miToken(),
       miErrors(),
-    ]
+    ].filter(Boolean)
   }
 
   async start() {
@@ -504,7 +513,15 @@ class APP {
       ) {
         try {
           this.app[appName].appConfig.router(router)(this.app[appName])
-        } catch (e) {}
+        } catch (e) {
+          this.app[appName].service.log &&
+            this.app[appName].service.log.push({
+              app: this.app[appName],
+              appName,
+              message: e.message,
+            })
+          console.log(e.message)
+        }
       }
 
       if (this.config.defaultRouter) {
@@ -1053,7 +1070,7 @@ class APP {
             }
           }
 
-          if (fn === 'findAll') {
+          if (['findAll', 'findAndCountAll'].includes(fn)) {
             const disabledFindAllList = _.get(
               app[appName],
               'appConfig.disabledFindAllList',
@@ -1067,7 +1084,7 @@ class APP {
                 (where && !_.isEmpty(where))
               )
             ) {
-              throw new Error(`请使用条件`)
+              throw new Error('请使用条件')
             }
           }
 
@@ -1226,6 +1243,35 @@ class APP {
           }
           if (['findOne', 'findAll', 'findAndCountAll'].includes(fn)) {
             // 拆分
+            if (
+              fn === 'findOne' &&
+              attributes &&
+              Array.isArray(attributes) &&
+              attributes.length > 0 &&
+              attributes.every(
+                (attribute) =>
+                  Array.isArray(attribute) &&
+                  attribute.length === 2 &&
+                  attribute.some((o) => o.startsWith('literal'))
+              )
+            ) {
+              const target = await app[appName].model[controller][fn]({
+                attributes: attributes.map((attribute) => {
+                  if (Array.isArray(attribute)) {
+                    return attribute.map((att) => {
+                      if (att.startsWith('literal')) {
+                        return Sequelize.literal(getLiteral(att))
+                      }
+                      return att
+                    })
+                  }
+                  return attribute
+                }),
+                where: _where,
+              })
+
+              return ctx.SUCCESS(target)
+            }
             if (is_split) {
               if (fn === 'findAndCountAll') {
                 const requiredInclude = myInclude

package/core/config.js

@@ -17,6 +17,7 @@ module.exports = {
   xmlBody: {
     limit: 1024 * 100,
   },
+  is_websocket: false,
   koaBody: {
     text: false,
     onError: (err, ctx) => {

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

@@ -60,25 +60,25 @@ exports.loadModel = async ({ app, appName }) => {
       // const id = ori_target ? ori_target.id : null
       const id = i + 1
 
-      let countNumber = 0
-      if (!['setting', 'auth'].includes(config.belongs)) {
-        if (currentDisabledFindAllList.length === 0 && app.model[result[i]]) {
-          countNumber = await app.model[result[i]].count()
-        }
-        if (countNumber >= 500) {
-          disabledFindAllList = [...disabledFindAllList, result[i]]
-          const tableIndexList = await app.service.system.getTableIndex({
-            app,
-            model: result[i],
-          })
-          if (countNumber >= 100000) {
-            console.warn('数据量大，请注意', result[i], countNumber)
-          }
-          if (tableIndexList.length <= 1) {
-            console.warn(`${result[i]} count ${countNumber}没有索引`)
-          }
-        }
-      }
+      // let countNumber = 0
+      // if (!['setting', 'auth'].includes(config.belongs)) {
+      //   if (currentDisabledFindAllList.length === 0 && app.model[result[i]]) {
+      //     countNumber = await app.model[result[i]].count()
+      //   }
+      //   if (countNumber >= 500) {
+      //     disabledFindAllList = [...disabledFindAllList, result[i]]
+      //     const tableIndexList = await app.service.system.getTableIndex({
+      //       app,
+      //       model: result[i],
+      //     })
+      //     if (countNumber >= 100000) {
+      //       console.warn('数据量大，请注意', result[i], countNumber)
+      //     }
+      //     if (tableIndexList.length <= 1) {
+      //       console.warn(`${result[i]} count ${countNumber}没有索引`)
+      //     }
+      //   }
+      // }
 
       const obj = {
         id,
@@ -154,7 +154,7 @@ exports.loadModel = async ({ app, appName }) => {
             if (
               !model[name].defaultValue &&
               typeof model[name].defaultValue !== 'undefined' &&
-              model[name].defaultValue !== 0
+              model[name].defaultValue != 0
             ) {
               defaultValue = 'null'
             }

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

@@ -141,6 +141,10 @@ exports.html = async (ctx) => {
       code,
     },
   })
+  if (!target) {
+    ctx.body = `没有code`
+    return
+  }
   ctx.body = `<!DOCTYPE html>
   <html lang="en">
   <head>

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

@@ -39,9 +39,13 @@ const compareIndex = (tableIndexList, modelIndexList = [], model) => {
     }
   }
 
-  const flag = tableIndexList.every((i) => {
-    return modelIndexList.some((m) => isSameArray(m.fields, i.fields, true))
-  })
+  const flag =
+    tableIndexList.every((i) => {
+      return modelIndexList.some((m) => isSameArray(m.fields, i.fields, true))
+    }) &&
+    modelIndexList.every((i) => {
+      return tableIndexList.some((m) => isSameArray(m.fields, i.fields, true))
+    })
 
   const intersection = lodash.intersectionWith(
     tableIndexList,
@@ -883,3 +887,51 @@ exports.dropIndex = async (ctx) => {
 
   ctx.SUCCESS(result)
 }
+
+exports.checkFrag = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { model } = ctx.request.body
+  if (!model) return ctx.ERROR(`model?`)
+
+  const query = `SELECT table_name, ROUND((data_free / data_length) * 100, 2) AS fragmentation_percentage
+  FROM information_schema.TABLES
+  WHERE table_schema = '${app.sequelize.config.database}' AND table_name = '${model}';`
+
+  const result = await app.sequelize.query(query)
+
+  if (result && result[0]) {
+    return ctx.SUCCESS(result[0][0])
+  }
+
+  return ctx.SUCCESS({})
+}
+
+exports.reset = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { model } = ctx.request.body
+
+  const count = await app.model[model].count()
+  if (count > 10000) {
+    return ctx.ERROR(`数据量太大，无法重置`)
+  }
+  const result = await app.model[model].findAll({
+    attributes: {
+      exclude: ['id'],
+    },
+  })
+
+  await app.model[model].sync({
+    force: true,
+  })
+
+  await app.model[model].bulkCreate(
+    result.map((item, index) => {
+      return {
+        ...item.toJSON(),
+        id: index + 1,
+      }
+    })
+  )
+
+  ctx.SUCCESS(result.length)
+}

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

@@ -8,7 +8,14 @@ const runVm = (_str) => {
 }
 
 const memRunVm = lodash.memoize(runVm)
-
+const getLiteral = (str) => {
+  const reg = /literal\((.+)\)/
+  const result = str.match(reg)
+  if (result) {
+    return result[1] // 返回第一个捕获组
+  }
+  return ''
+}
 exports.initData = async ({ includes, excludes, app, ctx }) => {
   const appConfig = getConfig(app)
   const { version: cacheVersion } = await appConfig.getObject('base')
@@ -211,6 +218,40 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
                     }
                   })
               } 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 &&

package/core/file/services/print.js

@@ -145,9 +145,10 @@ module.exports = class Singleton {
     }
   }
 
-  async getPrintList(machineCode, pageIndex = 1, pageSize = 10) {
+  async getPrintList(_machineCode, pageIndex = 1, pageSize = 10) {
     const app = this.config.app
     const accessToken = await this.getAccessToken()
+    const machineCode = _machineCode || this.config.machine_code
     try {
       const RpcClient = new yly.RpcClient(accessToken, this.oauthConfig)
       const Print = new yly.Printer(RpcClient)

package/core/file/utils/index.js

@@ -214,14 +214,45 @@ const isDateTime = (str) => {
     /^(\d{4}-\d{2}-\d{2})([T\s](\d{2}:\d{2}(:\d{2}(\.\d+)?)?)([+-]\d{2}:\d{2}|Z)?)?$/
   return dateRegex.test(str)
 }
+
+const getCol = (str) => {
+  const reg = /col\((.+)\)/
+  const result = str.match(reg)
+  if (result) {
+    return result[1] // 返回第一个捕获组
+  }
+  return ''
+}
+
+const getLiteral = (str) => {
+  const reg = /literal\((.+)\)/
+  const result = str.match(reg)
+  if (result) {
+    return result[1] // 返回第一个捕获组
+  }
+  return ''
+}
 const $lt = {
   check: (param) => typeof param === 'string',
   result: (param, key) => {
+    if (getCol(param[key])) {
+      return {
+        [key]: Sequelize.col(getCol(param[key])),
+      }
+    }
+
+    if (getLiteral(param[key])) {
+      return {
+        [key]: Sequelize.literal(getLiteral(param[key])),
+      }
+    }
+
     if (isDateTime(param[key])) {
       return {
         [key]: param[key],
       }
     }
+
     return {
       [key]: Sequelize.literal(param[key]),
     }
@@ -230,6 +261,17 @@ const $lt = {
 const $in = {
   check: (param) => typeof param === 'string',
   result: (param, key) => {
+    if (getCol(param[key])) {
+      return {
+        [key]: Sequelize.col(getCol(param[key])),
+      }
+    }
+
+    if (getLiteral(param[key])) {
+      return {
+        [key]: Sequelize.literal(getLiteral(param[key])),
+      }
+    }
     return {
       [key]: [Sequelize.literal(param[key])],
     }
@@ -239,6 +281,11 @@ const $between = {
   check: (param) =>
     Array.isArray(param) && param.every((p) => typeof param === 'string'),
   result: (param, key) => {
+    if (param[key].every((i) => getLiteral(i))) {
+      return {
+        [key]: param[key].map((item) => Sequelize.literal(getLiteral(item))),
+      }
+    }
     if (param[key].every((i) => isDateTime(i))) {
       return {
         [key]: param[key],

package/package.json

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