fix: 修复sequelize升级带来的版本问题

Author: pedro

app/api/cms/admin.js

@@ -74,7 +74,7 @@ admin.linGet(
     const { users, total } = await adminDao.getUsers(
       ctx,
       v.get("query.group_id"),
-      v.get("query.start"),
+      v.get("query.page"),
       v.get("query.count")
     );
     ctx.json({
@@ -159,7 +159,7 @@ admin.linGet(
     const v = await new PaginateValidator().validate(ctx);
     const { groups, total } = await adminDao.getGroups(
       ctx,
-      v.get("query.start"),
+      v.get("query.page"),
       v.get("query.count")
     );
     if (total < 1) {

app/api/cms/log.js

@@ -74,7 +74,7 @@ log.linGet(
   groupRequired,
   async ctx => {
     const v = await new PaginateValidator().validate(ctx);
-    const arr = await logDao.getUserNames(v.get("query.start"), v.get("query.count"));
+    const arr = await logDao.getUserNames(v.get("query.page"), v.get("query.count"));
     ctx.json(arr);
   }
 );

app/api/v1/book.js

@@ -28,7 +28,7 @@ exports.bookApi = bookApi;
 const bookDto = new BookDao();
 
 bookApi.get("/:id", async ctx => {
-  const v = await new PositiveIdValidator().validate();
+  const v = await new PositiveIdValidator().validate(ctx);
   const id = v.get("path.id");
   const book = await bookDto.getBook(id);
   if (!book) {
@@ -89,7 +89,7 @@ bookApi.linDelete(
   },
   groupRequired,
   async ctx => {
-    const v = await new PositiveIdValidator().validate();
+    const v = await new PositiveIdValidator().validate(ctx);
     const id = v.get("path.id");
     await bookDto.deleteBook(id);
     ctx.json(

app/dao/admin.js

@@ -11,6 +11,7 @@ const {
 
 const { has, set, get } = require("lodash");
 const { db } = require("lin-mizar/lin/db");
+const { Op } = require("sequelize");
 const dayjs = require("dayjs");
 
 class AdminDao {
@@ -19,7 +20,7 @@ class AdminDao {
       "SELECT lin_user.*,lin_group.`name` as group_name FROM lin_user LEFT JOIN lin_group ON lin_user.group_id = lin_group.id WHERE";
     groupId && (sql += " lin_user.group_id = :id AND");
     let users = await db.query(
-      sql + " lin_user.admin = :admin LIMIT :count OFFSET :start ",
+      sql + " lin_user.admin = :admin AND lin_user.delete_time IS NULL LIMIT :count OFFSET :start ",
       {
         replacements: groupId
           ? {
@@ -37,7 +38,7 @@ class AdminDao {
       }
     );
     let total = await db.query(
-      "SELECT COUNT(*) as count FROM lin_user WHERE lin_user.admin=:admin",
+      "SELECT COUNT(*) as count FROM lin_user WHERE lin_user.admin=:admin AND lin_user.delete_time IS NULL",
       {
         replacements: {
           admin: UserAdmin.COMMON
@@ -86,8 +87,7 @@ class AdminDao {
         msg: "用户不存在"
       });
     }
-    // 推荐调用软删除，即下面注释代码
-    user.softDelete();
+    user.destroy();
   }
 
   async updateUserInfo (ctx, v) {
@@ -295,7 +295,7 @@ class AdminDao {
         msg: "分组不存在"
       });
     }
-    v.get("auths").forEach(async item => {
+    v.get("body.auths").forEach(async item => {
       const one = await ctx.manager.authModel.findOne({
         where: {
           group_id: v.get("body.group_id"),
@@ -324,7 +324,7 @@ class AdminDao {
       where: {
         group_id: v.get("body.group_id"),
         auth: {
-          [db.Op.in]: v.get("body.auths")
+          [Op.in]: v.get("body.auths")
         }
       }
     });

app/dao/book.js

@@ -87,7 +87,7 @@ class BookDao {
         msg: "没有找到相关书籍"
       });
     }
-    book.softDelete();
+    book.destroy();
   }
 }
 

app/dao/log.js

@@ -7,7 +7,7 @@ const Sequelize = require("sequelize");
 
 class LogDao {
   async getLogs (v) {
-    const start = v.get("query.start");
+    const start = v.get("query.page");
     const count1 = v.get("query.count");
     let condition = {};
     v.get("body.name") && set(condition, "user_name", v.get("body.name"));
@@ -29,7 +29,7 @@ class LogDao {
   }
 
   async searchLogs (v, keyword) {
-    const start = v.get("query.start");
+    const start = v.get("query.page");
     const count1 = v.get("query.count");
     let condition = {};
     v.get("body.name") && set(condition, "user_name", v.get("body.name"));
@@ -38,7 +38,7 @@ class LogDao {
       set(condition, "time", {
         [Sequelize.Op.between]: [v.get("body.start"), v.get("body.end")]
       });
-    let { rows, count } = await Log.findAndCount({
+    let { rows, count } = await Log.findAndCountAll({
       where: Object.assign({}, condition, {
         message: {
           [Sequelize.Op.like]: `%${keyword}%`

package.json

@@ -39,6 +39,6 @@
     "@koa/cors": "^2.2.3",
     "koa": "^2.7.0",
     "koa-bodyparser": "^4.2.1",
-    "lin-mizar": "^0.0.1-alpha.4"
+    "lin-mizar": "^0.0.1-alpha.9"
   }
 }