q-koa 11.8.3 → 11.8.6

package/core/app.js

@@ -1099,6 +1099,24 @@ class APP {
                       $in: [Sequelize.literal(item.$in)],
                     }
                   }
+                  console.log(item.$lt)
+                  if (
+                    item.hasOwnProperty('$lt') &&
+                    typeof item.$lt === 'string'
+                  ) {
+                    return {
+                      $lt: Sequelize.literal(item.$lt),
+                    }
+                  }
+
+                  if (
+                    item.hasOwnProperty('$gt') &&
+                    typeof item.$gt === 'string'
+                  ) {
+                    return {
+                      $gt: Sequelize.literal(item.$gt),
+                    }
+                  }
                   return item
                 } else {
                   return item

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

@@ -53,9 +53,6 @@ exports.login = async (ctx) => {
   }
 
   if (!checkLoginResult) throw new Error('账号密码错误')
-  const token = await app.sign({
-    user: checkLoginResult,
-  })
 
   const result = await app.model.administrator.findOne({
     where: {
@@ -74,6 +71,13 @@ exports.login = async (ctx) => {
     ],
   })
   const objResult = result.toJSON()
+  if (!objResult.role || !objResult.role.permission_id) {
+    throw new Error('无法登录，请重试')
+  }
+
+  const token = await app.sign({
+    user: checkLoginResult,
+  })
   return ctx.SUCCESS({
     token,
     user: {

package/core/file/plugins/douyin_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/h5_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/h5_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/model/service.js

@@ -74,6 +74,13 @@ exports.loadModel = async ({ app, appName }) => {
         }
         if (countNumber >= 500) {
           disabledFindAllList = [...disabledFindAllList, result[i]]
+          const tableIndexList = await app.service.system.getTableIndex({
+            app,
+            model: result[i],
+          })
+          if (tableIndexList.length <= 1) {
+            console.warn(`${result[i]} count ${countNumber}没有索引`)
+          }
         }
       }
 

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

@@ -581,7 +581,6 @@ exports.showAllModel = async (ctx) => {
         count,
         name: target.name,
         model: list[i],
-        count,
       },
     ]
   }
@@ -731,7 +730,7 @@ exports.checkIndex = async (ctx) => {
             ...res,
             [current]: {
               isSame,
-              tableIndexList,
+              indexList: tableIndexList.filter((i) => i.name !== 'PRIMARY'),
             },
           }
         }
@@ -751,7 +750,9 @@ exports.checkIndex = async (ctx) => {
     const isSame = compareIndex(tableIndexList, modelIndexList, model)
     return ctx.SUCCESS({
       isSame,
-      ...(isSame ? {} : { tableIndexList }),
+      ...(isSame
+        ? {}
+        : { indexList: tableIndexList.filter((i) => i.name !== 'PRIMARY') }),
     })
   }
 }

package/package.json

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