feat:更新依赖和优化校验器

Author: pedro

app/api/cms/admin.js

@@ -2,26 +2,31 @@
 
 const {
   LinRouter,
-  paginate,
   routeMetaInfo,
   adminRequired,
   Success,
-  ParametersException,
   NotFound,
   Failed
 } = require("lin-mizar");
 
-const { has, set, get, toSafeInteger, isInteger } = require("lodash");
+const { has, set } = require("lodash");
+
 const {
+  DispatchAuthsValidator,
+  RemoveAuthsValidator,
+  UpdateGroupValidator,
   ResetPasswordValidator,
+  AdminUsersValidator,
   UpdateUserInfoValidator,
   NewGroupValidator,
-  UpdateGroupValidator,
-  DispatchAuthValidator,
-  DispatchAuthsValidator,
-  RemoveAuthsValidator
-} = require("../../validators/cms");
-const { getSafeParamId } = require("../../libs/util");
+  DispatchAuthValidator
+} = require("../../validators/admin");
+
+const {
+  PositiveIdValidator,
+  PaginateValidator
+} = require("../../validators/common");
+
 const { AdminDao } = require("../../dao/admin");
 
 const admin = new LinRouter({
@@ -65,13 +70,12 @@ admin.linGet(
   },
   adminRequired,
   async ctx => {
-    const groupId = get(ctx.request.query, "group_id");
-    const { start, count } = paginate(ctx);
+    const v = await new AdminUsersValidator().validate(ctx);
     const { users, total } = await adminDao.getUsers(
       ctx,
-      groupId,
-      start,
-      count
+      v.get("query.group_id"),
+      v.get("query.start"),
+      v.get("query.count")
     );
     ctx.json({
       collection: users,
@@ -92,13 +96,7 @@ admin.linPut(
   adminRequired,
   async ctx => {
     const v = await new ResetPasswordValidator().validate(ctx);
-    const id = toSafeInteger(get(ctx.params, "id"));
-    if (!isInteger(id)) {
-      throw new ParametersException({
-        msg: "路由参数错误"
-      });
-    }
-    await adminDao.changeUserPassword(ctx, v, id);
+    await adminDao.changeUserPassword(ctx, v);
     ctx.json(
       new Success({
         msg: "密码修改成功"
@@ -117,12 +115,8 @@ admin.linDelete(
   },
   adminRequired,
   async ctx => {
-    const id = toSafeInteger(get(ctx.params, "id"));
-    if (!isInteger(id)) {
-      throw new ParametersException({
-        msg: "路由参数错误"
-      });
-    }
+    const v = await new PositiveIdValidator().validate(ctx);
+    const id = v.get("path.id");
     await adminDao.deleteUser(ctx, id);
     ctx.json(
       new Success({
@@ -143,13 +137,7 @@ admin.linPut(
   adminRequired,
   async ctx => {
     const v = await new UpdateUserInfoValidator().validate(ctx);
-    const id = toSafeInteger(get(ctx.params, "id"));
-    if (!isInteger(id)) {
-      throw new ParametersException({
-        msg: "路由参数错误"
-      });
-    }
-    await adminDao.updateUserInfo(ctx, v, id);
+    await adminDao.updateUserInfo(ctx, v);
     ctx.json(
       new Success({
         msg: "操作成功"
@@ -168,8 +156,12 @@ admin.linGet(
   },
   adminRequired,
   async ctx => {
-    const { start, count } = paginate(ctx);
-    const { groups, total } = await adminDao.getGroups(ctx, start, count);
+    const v = await new PaginateValidator().validate(ctx);
+    const { groups, total } = await adminDao.getGroups(
+      ctx,
+      v.get("query.start"),
+      v.get("query.count")
+    );
     if (total < 1) {
       throw new NotFound({
         msg: "未找到任何权限组"
@@ -212,13 +204,8 @@ admin.linGet(
   },
   adminRequired,
   async ctx => {
-    const id = toSafeInteger(get(ctx.params, "id"));
-    if (!isInteger(id)) {
-      throw new ParametersException({
-        msg: "路由参数错误"
-      });
-    }
-    const group = await adminDao.getGroup(ctx, id);
+    const v = await new PositiveIdValidator().validate(ctx);
+    const group = await adminDao.getGroup(ctx, v.get("path.id"));
     ctx.json(group);
   }
 );
@@ -262,8 +249,7 @@ admin.linPut(
   adminRequired,
   async ctx => {
     const v = await new UpdateGroupValidator().validate(ctx);
-    const id = getSafeParamId(ctx);
-    await adminDao.updateGroup(ctx, v, id);
+    await adminDao.updateGroup(ctx, v);
     ctx.json(
       new Success({
         msg: "更新分组成功"
@@ -282,7 +268,8 @@ admin.linDelete(
   },
   adminRequired,
   async ctx => {
-    const id = getSafeParamId(ctx);
+    const v = await new PositiveIdValidator().validate(ctx);
+    const id = v.get("path.id");
     await adminDao.deleteGroup(ctx, id);
     ctx.json(
       new Success({

app/api/cms/log.js

@@ -1,7 +1,8 @@
 "use strict";
 
-const { LinRouter, groupRequired, NotFound, paginate } = require("lin-mizar");
-const { LogFindValidator } = require("../../validators/cms");
+const { LinRouter, groupRequired, NotFound } = require("lin-mizar");
+const { LogFindValidator } = require("../../validators/log");
+const { PaginateValidator } = require("../../validators/common");
 const { get } = require("lodash");
 const { LogDao } = require("../../dao/log");
 
@@ -24,8 +25,7 @@ log.linGet(
   groupRequired,
   async ctx => {
     const v = await new LogFindValidator().validate(ctx);
-    const { start, count } = paginate(ctx);
-    const { rows, total } = await logDao.getLogs(v, start, count);
+    const { rows, total } = await logDao.getLogs(v);
     if (total < 1) {
       throw new NotFound({
         msg: "没有找到相关日志"
@@ -50,8 +50,7 @@ log.linGet(
   async ctx => {
     const v = await new LogFindValidator().validate(ctx);
     const keyword = get(ctx.request.query, "keyword", "");
-    const { start, count } = paginate(ctx);
-    const { logs, total } = await logDao.searchLogs(v, start, count, keyword);
+    const { logs, total } = await logDao.searchLogs(v, keyword);
     if (total < 1) {
       throw new NotFound({
         msg: "没有找到相关日志"
@@ -74,8 +73,8 @@ log.linGet(
   },
   groupRequired,
   async ctx => {
-    const { start, count } = paginate(ctx);
-    const arr = await logDao.getUserNames(start, count);
+    const v = await new PaginateValidator().validate(ctx);
+    const arr = await logDao.getUserNames(v.get("query.start"), v.get("query.count"));
     ctx.json(arr);
   }
 );

app/api/cms/user.js

@@ -15,7 +15,7 @@ const {
   LoginValidator,
   UpdateInfoValidator,
   ChangePasswordValidator
-} = require("../../validators/cms");
+} = require("../../validators/user");
 
 const { UserDao } = require("../../dao/user");
 

app/api/v1/book.js

@@ -5,7 +5,12 @@ const { getSafeParamId } = require("../../libs/util");
 const {
   BookSearchValidator,
   CreateOrUpdateBookValidator
-} = require("../../validators/cms");
+} = require("../../validators/book");
+
+const {
+  PositiveIdValidator
+} = require("../../validators/common");
+
 const { BookNotFound } = require("../../libs/err-code");
 const { Book } = require("../../models/book");
 const { BookDao } = require("../../dao/book");
@@ -23,7 +28,8 @@ exports.bookApi = bookApi;
 const bookDto = new BookDao();
 
 bookApi.get("/:id", async ctx => {
-  const id = getSafeParamId(ctx);
+  const v = await new PositiveIdValidator().validate();
+  const id = v.get("path.id");
   const book = await bookDto.getBook(id);
   if (!book) {
     throw new NotFound({
@@ -83,7 +89,8 @@ bookApi.linDelete(
   },
   groupRequired,
   async ctx => {
-    const id = getSafeParamId(ctx);
+    const v = await new PositiveIdValidator().validate();
+    const id = v.get("path.id");
     await bookDto.deleteBook(id);
     ctx.json(
       new Success({

app/config/secure.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.db = {
-  database: "lin-cms2",
+  database: "lin-cms4",
   host: "localhost",
   port: 3306,
   username: "root",

app/dao/admin.js

@@ -57,7 +57,8 @@ class AdminDao {
     };
   }
 
-  async changeUserPassword (ctx, v, id) {
+  async changeUserPassword (ctx, v) {
+    const id = v.get("path.id");
     const user = await ctx.manager.userModel.findOne({
       where: {
         id: id,
@@ -89,7 +90,8 @@ class AdminDao {
     user.softDelete();
   }
 
-  async updateUserInfo (ctx, v, id) {
+  async updateUserInfo (ctx, v) {
+    const id = v.get("path.id");
     const user = await ctx.manager.userModel.findOne({
       where: {
         id: id,
@@ -212,7 +214,8 @@ class AdminDao {
     return true;
   }
 
-  async updateGroup (ctx, v, id) {
+  async updateGroup (ctx, v) {
+    const id = v.get("path.id");
     const exit = await ctx.manager.groupModel.findById(id);
     if (!exit) {
       throw new NotFound({

app/dao/log.js

@@ -6,7 +6,9 @@ const { db } = require("lin-mizar/lin/db");
 const Sequelize = require("sequelize");
 
 class LogDao {
-  async getLogs (v, start, count1) {
+  async getLogs (v) {
+    const start = v.get("query.start");
+    const count1 = v.get("query.count");
     let condition = {};
     v.get("body.name") && set(condition, "user_name", v.get("body.name"));
     v.get("body.start") &&
@@ -26,7 +28,9 @@ class LogDao {
     };
   }
 
-  async searchLogs (v, start, count1, keyword) {
+  async searchLogs (v, keyword) {
+    const start = v.get("query.start");
+    const count1 = v.get("query.count");
     let condition = {};
     v.get("body.name") && set(condition, "user_name", v.get("body.name"));
     v.get("body.start") &&

app/models/book.js

@@ -2,41 +2,41 @@
 
 const { InfoCrudMixin } = require("lin-mizar/lin/interface");
 const { merge } = require("lodash");
-const Sequelize = require("sequelize");
+const { Sequelize, Model } = require("sequelize");
 const { db } = require("lin-mizar/lin/db");
 
-let Book = db.define(
-  "book",
-  merge(
-    {
-      id: {
-        type: Sequelize.INTEGER,
-        primaryKey: true,
-        autoIncrement: true
-      },
-      title: {
-        type: Sequelize.STRING(50),
-        allowNull: false
-      },
-      author: {
-        type: Sequelize.STRING(30),
-        allowNull: true,
-        defaultValue: "未名"
-      },
-      summary: {
-        type: Sequelize.STRING(1000),
-        allowNull: true
-      },
-      image: {
-        type: Sequelize.STRING(100),
-        allowNull: true
-      }
+class Book extends Model {}
+
+Book.init(
+  {
+    id: {
+      type: Sequelize.INTEGER,
+      primaryKey: true,
+      autoIncrement: true
+    },
+    title: {
+      type: Sequelize.STRING(50),
+      allowNull: false
     },
-    InfoCrudMixin.attributes
-  ),
+    author: {
+      type: Sequelize.STRING(30),
+      allowNull: true,
+      defaultValue: "未名"
+    },
+    summary: {
+      type: Sequelize.STRING(1000),
+      allowNull: true
+    },
+    image: {
+      type: Sequelize.STRING(100),
+      allowNull: true
+    }
+  },
   merge(
     {
-      tableName: "book"
+      tableName: "book",
+      modelName: "book",
+      sequelize: db
     },
     InfoCrudMixin.options
   )
@@ -54,10 +54,4 @@ Book.prototype.toJSON = function () {
   return origin;
 };
 
-Book.prototype.softDelete = function () {
-  this.delete_time = new Date();
-  // 更新数据库
-  this.save();
-};
-
 exports.Book = Book;