q-koa 13.2.6 → 13.2.8

package/core/app.js

@@ -90,7 +90,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 +103,7 @@ class APP {
       miResponse(config.response),
       // miToken(),
       miErrors(),
-    ]
+    ].filter(Boolean)
   }
 
   async start() {
@@ -1226,6 +1226,34 @@ class APP {
           }
           if (['findOne', 'findAll', 'findAndCountAll'].includes(fn)) {
             // 拆分
+            if (
+              fn === 'findOne' &&
+              attributes &&
+              attributes.length > 0 &&
+              attributes.every(
+                (attribute) =>
+                  Array.isArray(attribute) &&
+                  attribute.length === 2 &&
+                  attribute.some((o) => o.includes('SUM'))
+              )
+            ) {
+              const target = await app[appName].model[controller][fn]({
+                attributes: attributes.map((attribute) => {
+                  if (Array.isArray(attribute)) {
+                    return attribute.map((att) => {
+                      if (att.startsWith('SUM')) {
+                        return Sequelize.literal(att)
+                      }
+                      return att
+                    })
+                  }
+                  return attribute
+                }),
+                where: _where,
+              })
+
+              return ctx.SUCCESS(target)
+            }
             if (is_split) {
               if (fn === 'findAndCountAll') {
                 const requiredInclude = myInclude
@@ -2188,7 +2216,7 @@ APP.getConfig = (app) => ({
     } else {
       app.cache.set(target, null)
 
-      if (app.appConfig.appName) {
+      if (app.appConfig.appName && app.appConfig.productionHost) {
         const ipHost = (
           Array.isArray(app.appConfig.productionHost)
             ? app.appConfig.productionHost

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,
@@ -114,7 +114,7 @@ exports.loadModel = async ({ app, appName }) => {
         list: attributes.map((attr, index) => {
           const name = attr.match(/exports.(.*)=/)[1].trim()
           let defaultValue = ''
-          if (model[name] && model[name].hasOwnProperty('defaultValue')) {
+          if (model[name] && 'defaultValue' in model[name]) {
             if (
               typeof model[name].defaultValue === 'boolean' &&
               model[name].defaultValue === true
@@ -165,10 +165,7 @@ exports.loadModel = async ({ app, appName }) => {
             ) {
               defaultValue = 'null'
             }
-          } else if (
-            model[name] &&
-            !model[name].hasOwnProperty('defaultValue')
-          ) {
+          } else if (model[name] && !('defaultValue' in model[name])) {
             defaultValue = "''"
           }
 

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

@@ -883,3 +883,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/package.json

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