q-koa 11.8.1 → 11.8.3

package/core/app.js

@@ -685,9 +685,13 @@ class APP {
                   this.app[appName]
                 )
               } else if (
-                ['controller', 'validate', 'afterExecute', 'service'].includes(
-                  n
-                )
+                [
+                  'config',
+                  'controller',
+                  'validate',
+                  'afterExecute',
+                  'service',
+                ].includes(n)
               ) {
                 const defaultPath = path.resolve(
                   __dirname,

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

@@ -16,4 +16,11 @@ module.exports = {
   is_split_count: false,
   show_virtual: false,
   deleteCheckList: [],
+  indexList: [
+    {
+      name: 'key',
+      unique: true,
+      fields: ['key'],
+    },
+  ],
 }

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

@@ -5,7 +5,7 @@ exports.key = {
   comment: 'key',
   allowNull: false,
   is_mock: true,
-  unique: true,
+  unique: 'key',
   sortOrder: 1,
   mock: () => Random.ctitle(),
 }

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

@@ -16,4 +16,12 @@ module.exports = {
   sortOrder: 1,
   reference: [],
   excludeAuth: [],
+  indexList: [
+    {
+      name: 'openid',
+      unique: true,
+      fields: ['openid'],
+    },
+    { fields: ['user_id'] },
+  ],
 }

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

@@ -7,7 +7,7 @@ exports.openid = {
   is_mock: false,
   defaultValue: '',
   sortOrder: 1,
-  unique: true,
+  unique: ['openid'],
 }
 
 exports.user_id = {

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

@@ -0,0 +1,23 @@
+module.exports = {
+  name: '微信开放平台用户',
+  belongs: 'page',
+  multiple: false,
+  availableSort: false,
+  order: ['created_at'],
+  select: [{ key: 'user_id' }, { key: 'nick_name' }],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [{ sort: 'descending', type: 'id' }],
+  comment: { created_at: '创建时间' },
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  indexList: [
+    {
+      name: 'openid',
+      unique: true,
+      fields: ['openid'],
+    },
+    { fields: ['user_id'] },
+  ],
+}

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

@@ -0,0 +1,59 @@
+const { Sequelize, Random } = require('q-koa')
+
+exports.openid = {
+  type: Sequelize.STRING,
+  comment: 'openid',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 1,
+  unique: ['openid'],
+}
+
+exports.user_id = {
+  type: Sequelize.MEDIUMINT.UNSIGNED,
+  comment: '用户',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: 0,
+  sortOrder: 2,
+  hasOne: true,
+}
+
+exports.nick_name = {
+  type: Sequelize.STRING,
+  comment: '昵称',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 3,
+}
+
+exports.avatar = {
+  type: Sequelize.STRING(1000),
+  comment: '头像',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 8,
+}
+
+exports.appid = {
+  type: Sequelize.STRING,
+  comment: 'app_id',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 10,
+  mock: () => Random.ctitle(),
+}
+
+exports.unionid = {
+  type: Sequelize.STRING,
+  comment: 'unionid',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 11,
+  mock: () => Random.ctitle(),
+}

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

@@ -11,6 +11,37 @@ const cache = new LRU({
   maxAge: 1000 * 60 * 60,
 })
 
+const isSameArray = (_arr1 = [], _arr2 = [], deep = true) => {
+  const arr1 = Array.isArray(_arr1) ? _arr1 : [_arr1]
+  const arr2 = Array.isArray(_arr2) ? _arr2 : [_arr2]
+  return lodash.isEqualWith(
+    deep ? arr1 : arr1.sort(),
+    deep ? arr2 : arr2.sort(),
+    lodash.isEqual
+  )
+}
+const compareIndex = (tableIndexList, modelIndexList = [], model) => {
+  const flag =
+    tableIndexList
+      .filter((i) => i.name !== 'PRIMARY')
+      .filter((i) => {
+        return !(
+          ((i.name.startsWith(model) &&
+            i.fields.every((f) => i.name.includes(f))) ||
+            modelIndexList
+              .filter((i) => i.name !== 'PRIMARY')
+              .some((m) => m.name === i.name)) &&
+          modelIndexList
+            .filter((i) => i.name !== 'PRIMARY')
+            .some((m) => isSameArray(m.fields, i.fields, true))
+        )
+      }).length === 0 &&
+    tableIndexList.filter((i) => i.name !== 'PRIMARY').length ===
+      modelIndexList.filter((i) => i.name !== 'PRIMARY').length
+
+  return flag
+}
+
 exports.initModel = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { model, option } = ctx.request.body
@@ -674,3 +705,69 @@ exports.copyOther = async (ctx) => {
   }
   ctx.SUCCESS({ successList, failList })
 }
+
+exports.checkIndex = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { model } = ctx.request.body
+  if (!model) return ctx.ERROR('model不能为空')
+
+  if (model === 'all') {
+    const modelList = Object.keys(app.model)
+    let res = {}
+    for (let i = 0; i < modelList.length; i++) {
+      const current = modelList[i]
+      try {
+        const tableIndexList = await app.service.system.getTableIndex({
+          app,
+          model: current,
+        })
+        const modelIndexList = app.config[current].indexList
+
+        const isSame = compareIndex(tableIndexList, modelIndexList, current)
+        if (isSame) {
+        } else {
+          res = {
+            ...res,
+            [current]: {
+              isSame,
+              tableIndexList,
+            },
+          }
+        }
+      } catch (e) {
+        throw new Error(`${current}: ${e.message}`)
+      }
+    }
+    return ctx.SUCCESS(res)
+  } else {
+    const tableIndexList = await app.service.system.getTableIndex({
+      app,
+      model,
+    })
+
+    const modelIndexList = app.config[model].indexList
+
+    const isSame = compareIndex(tableIndexList, modelIndexList, model)
+    return ctx.SUCCESS({
+      isSame,
+      ...(isSame ? {} : { tableIndexList }),
+    })
+  }
+}
+
+exports.dropIndex = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const { model, key } = ctx.request.body
+
+  if (!model) return ctx.ERROR(`drop model?`)
+  const keyList = Array.isArray(key) ? key : [key]
+  if (keyList.length === 0) return ctx.ERROR(`drop key？`)
+
+  const dropStr = keyList.map((item) => `DROP KEY \`${item}\``).join(',')
+  const result = await app.sequelize.query(
+    `ALTER TABLE \`${model}\` ${dropStr}`
+  )
+
+  ctx.SUCCESS(result)
+}

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

@@ -327,3 +327,17 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
   }
   return obj
 }
+
+exports.getTableIndex = async ({ app, model }) => {
+  if (!model) throw new Error(`没有${model}`)
+
+  const res = await app.sequelize.query(`show keys from \`${model}\``)
+  const groupRes = lodash.groupBy(res[0], 'Key_name')
+  const result = Object.keys(groupRes).map((Key_name) => {
+    return {
+      name: groupRes[Key_name][0].Key_name,
+      fields: groupRes[Key_name].map((i) => i.Column_name),
+    }
+  })
+  return result
+}

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

@@ -3,13 +3,21 @@ module.exports = {
   belongs: 'page',
   multiple: false,
   availableSort: false,
-  order: ["created_at"],
-  select: [{"key":"user_id"},{"key":"nick_name"}],
+  order: ['created_at'],
+  select: [{ key: 'user_id' }, { key: 'nick_name' }],
   excludes: [],
   limit: 20,
   defaultOrder: [{ sort: 'descending', type: 'id' }],
-  comment: {"created_at":"创建时间"},
+  comment: { created_at: '创建时间' },
   sortOrder: 1,
   reference: [],
   excludeAuth: [],
+  indexList: [
+    {
+      name: 'openid',
+      unique: true,
+      fields: ['openid'],
+    },
+    { fields: ['user_id'] },
+  ],
 }

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

@@ -4,7 +4,7 @@ exports.openid = {
   type: Sequelize.STRING,
   comment: 'openid',
   allowNull: false,
-  unique: true,
+  unique: ['openid'],
 }
 
 exports.nick_name = {

package/package.json

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