feat:重构校验器

Author: pedro

app/api/cms/log.js

@@ -1,11 +1,6 @@
 "use strict";
 
-const {
-  LinRouter,
-  groupRequired,
-  NotFound,
-  paginate
-} = require("lin-mizar");
+const { LinRouter, groupRequired, NotFound, paginate } = require("lin-mizar");
 const { LogFindValidator } = require("../../validators/cms");
 const { get } = require("lodash");
 const { LogDao } = require("../../dao/log");

app/api/cms/test.js

@@ -1,6 +1,11 @@
 "use strict";
 
-const { loginRequired, LinRouter, logger, groupRequired } = require("lin-mizar");
+const {
+  loginRequired,
+  LinRouter,
+  logger,
+  groupRequired
+} = require("lin-mizar");
 
 const test = new LinRouter({
   prefix: "/cms/test"

app/api/cms/user.js

@@ -57,8 +57,8 @@ user.linPost(
   async ctx => {
     const v = await new LoginValidator().validate(ctx);
     let user = await ctx.manager.userModel.verify(
-      v.get("nickname"),
-      v.get("password")
+      v.get("body.nickname"),
+      v.get("body.password")
     );
     const { accessToken, refreshToken } = getTokens(user);
     ctx.json({
@@ -101,8 +101,8 @@ user.linPut(
     const v = await new ChangePasswordValidator().validate(ctx);
     let user = ctx.currentUser;
     const ok = user.changePassword(
-      v.get("old_password"),
-      v.get("new_password")
+      v.get("body.old_password"),
+      v.get("body.new_password")
     );
     if (ok) {
       user.save();

app/api/v1/book.js

@@ -45,7 +45,7 @@ bookApi.get("/", async ctx => {
 
 bookApi.get("/search/one", async ctx => {
   const v = await new BookSearchValidator().validate(ctx);
-  const book = await bookDto.getBookByKeyword(v.get("q"));
+  const book = await bookDto.getBookByKeyword(v.get("query.q"));
   if (!book) {
     throw new BookNotFound();
   }

app/dao/admin.js

@@ -69,7 +69,7 @@ class AdminDao {
         msg: "用户不存在"
       });
     }
-    user.resetPassword(v.get("new_password"));
+    user.resetPassword(v.get("body.new_password"));
     user.save();
   }
 
@@ -101,10 +101,10 @@ class AdminDao {
         msg: "用户不存在"
       });
     }
-    if (user.email !== v.get("email")) {
+    if (user.email !== v.get("body.email")) {
       const exit = await ctx.manager.userModel.findOne({
         where: {
-          email: v.get("email"),
+          email: v.get("body.email"),
           delete_time: null
         }
       });
@@ -114,8 +114,8 @@ class AdminDao {
         });
       }
     }
-    user.group_id = v.get("group_id");
-    user.email = v.get("email");
+    user.group_id = v.get("body.group_id");
+    user.email = v.get("body.email");
     user.save();
   }
 
@@ -172,7 +172,7 @@ class AdminDao {
   async createGroup (ctx, v) {
     const exit = await ctx.manager.groupModel.findOne({
       where: {
-        name: v.get("name")
+        name: v.get("body.name")
       }
     });
     if (exit) {
@@ -185,14 +185,14 @@ class AdminDao {
       transaction = await db.transaction();
       const group = await ctx.manager.groupModel.create(
         {
-          name: v.get("name"),
-          info: v.get("info")
+          name: v.get("body.name"),
+          info: v.get("body.info")
         },
         {
           transaction
         }
       );
-      for (const item of v.get("auths")) {
+      for (const item of v.get("body.auths")) {
         const { auth, module } = findMetaByAuth(item);
         await ctx.manager.authModel.create(
           {
@@ -219,8 +219,8 @@ class AdminDao {
         msg: "分组不存在，更新失败"
       });
     }
-    exit.name = v.get("name");
-    exit.info = v.get("info");
+    exit.name = v.get("body.name");
+    exit.info = v.get("body.info");
     exit.save();
   }
 
@@ -260,16 +260,16 @@ class AdminDao {
   }
 
   async dispatchAuth (ctx, v) {
-    const group = await ctx.manager.groupModel.findById(v.get("group_id"));
+    const group = await ctx.manager.groupModel.findById(v.get("body.group_id"));
     if (!group) {
       throw new NotFound({
         msg: "分组不存在"
       });
     }
     const one = await ctx.manager.authModel.findOne({
       where: {
-        group_id: v.get("group_id"),
-        auth: v.get("auth")
+        group_id: v.get("body.group_id"),
+        auth: v.get("body.auth")
       }
     });
     if (one) {
@@ -278,15 +278,15 @@ class AdminDao {
       });
     }
     const au = new ctx.manager.authModel();
-    const { auth, module } = findMetaByAuth(v.get("auth"));
+    const { auth, module } = findMetaByAuth(v.get("body.auth"));
     au.auth = auth;
     au.module = module;
-    au.group_id = v.get("group_id");
+    au.group_id = v.get("body.group_id");
     await au.save();
   }
 
   async dispatchAuths (ctx, v) {
-    const group = await ctx.manager.groupModel.findById(v.get("group_id"));
+    const group = await ctx.manager.groupModel.findById(v.get("body.group_id"));
     if (!group) {
       throw new NotFound({
         msg: "分组不存在"
@@ -295,7 +295,7 @@ class AdminDao {
     v.get("auths").forEach(async item => {
       const one = await ctx.manager.authModel.findOne({
         where: {
-          group_id: v.get("group_id"),
+          group_id: v.get("body.group_id"),
           auth: item
         }
       });
@@ -304,24 +304,24 @@ class AdminDao {
         const { auth, module } = findMetaByAuth(item);
         au.auth = auth;
         au.module = module;
-        au.group_id = v.get("group_id");
+        au.group_id = v.get("body.group_id");
         await au.save();
       }
     });
   }
 
   async removeAuths (ctx, v) {
-    const group = await ctx.manager.groupModel.findById(v.get("group_id"));
+    const group = await ctx.manager.groupModel.findById(v.get("body.group_id"));
     if (!group) {
       throw new NotFound({
         msg: "分组不存在"
       });
     }
     await ctx.manager.authModel.destroy({
       where: {
-        group_id: v.get("group_id"),
+        group_id: v.get("body.group_id"),
         auth: {
-          [db.Op.in]: v.get("auths")
+          [db.Op.in]: v.get("body.auths")
         }
       }
     });

app/dao/book.js

@@ -44,7 +44,7 @@ class BookDao {
   async createBook (v) {
     const book = await Book.findOne({
       where: {
-        title: v.get("title"),
+        title: v.get("body.title"),
         delete_time: null
       }
     });
@@ -54,10 +54,10 @@ class BookDao {
       });
     }
     const bk = new Book();
-    bk.title = v.get("title");
-    bk.author = v.get("author");
-    bk.summary = v.get("summary");
-    bk.image = v.get("image");
+    bk.title = v.get("body.title");
+    bk.author = v.get("body.author");
+    bk.summary = v.get("body.summary");
+    bk.image = v.get("body.image");
     bk.save();
   }
 
@@ -68,10 +68,10 @@ class BookDao {
         msg: "没有找到相关书籍"
       });
     }
-    book.title = v.get("title");
-    book.author = v.get("author");
-    book.summary = v.get("summary");
-    book.image = v.get("image");
+    book.title = v.get("body.title");
+    book.author = v.get("body.author");
+    book.summary = v.get("body.summary");
+    book.image = v.get("body.image");
     book.save();
   }
 

app/dao/log.js

@@ -8,11 +8,11 @@ const Sequelize = require("sequelize");
 class LogDao {
   async getLogs (v, start, count1) {
     let condition = {};
-    v.get("name") && set(condition, "user_name", v.get("name"));
-    v.get("start") &&
-      v.get("end") &&
+    v.get("body.name") && set(condition, "user_name", v.get("body.name"));
+    v.get("body.start") &&
+      v.get("body.end") &&
       set(condition, "time", {
-        [Sequelize.Op.between]: [v.get("start"), v.get("end")]
+        [Sequelize.Op.between]: [v.get("body.start"), v.get("body.end")]
       });
     let { rows, count } = await Log.findAndCountAll({
       where: Object.assign({}, condition),
@@ -28,11 +28,11 @@ class LogDao {
 
   async searchLogs (v, start, count1, keyword) {
     let condition = {};
-    v.get("name") && set(condition, "user_name", v.get("name"));
-    v.get("start") &&
-      v.get("end") &&
+    v.get("body.name") && set(condition, "user_name", v.get("body.name"));
+    v.get("body.start") &&
+      v.get("body.end") &&
       set(condition, "time", {
-        [Sequelize.Op.between]: [v.get("start"), v.get("end")]
+        [Sequelize.Op.between]: [v.get("body.start"), v.get("body.end")]
       });
     let { rows, count } = await Log.findAndCount({
       where: Object.assign({}, condition, {

app/dao/user.js

@@ -8,18 +8,18 @@ class UserDao {
   async createUser (ctx, v) {
     let user = await ctx.manager.userModel.findOne({
       where: {
-        nickname: v.get("nickname")
+        nickname: v.get("body.nickname")
       }
     });
     if (user) {
       throw new RepeatException({
         msg: "用户名重复，请重新输入"
       });
     }
-    if (v.get("email") && v.get("email").trim() !== "") {
+    if (v.get("body.email") && v.get("body.email").trim() !== "") {
       user = await ctx.manager.userModel.findOne({
         where: {
-          email: v.get("email")
+          email: v.get("body.email")
         }
       });
       if (user) {
@@ -33,10 +33,10 @@ class UserDao {
 
   async updateUser (ctx, v) {
     let user = ctx.currentUser;
-    if (user.email !== v.get("email")) {
+    if (user.email !== v.get("body.email")) {
       const exit = await ctx.manager.userModel.findOne({
         where: {
-          email: v.get("email")
+          email: v.get("body.email")
         }
       });
       if (exit) {
@@ -45,7 +45,7 @@ class UserDao {
         });
       }
     }
-    user.email = v.get("email");
+    user.email = v.get("body.email");
     user.save();
   }
 
@@ -88,11 +88,11 @@ class UserDao {
 
   registerUser (ctx, v) {
     const user = new ctx.manager.userModel();
-    user.nickname = v.get("nickname");
-    user.password = v.get("password");
-    user.group_id = v.get("group_id");
-    if (v.get("email") && v.get("email").trim() !== "") {
-      user.email = v.get("email");
+    user.nickname = v.get("body.nickname");
+    user.password = v.get("body.password");
+    user.group_id = v.get("body.group_id");
+    if (v.get("body.email") && v.get("body.email").trim() !== "") {
+      user.email = v.get("body.email");
     }
     user.save();
   }

app/plugins/notify/app/message.js

@@ -66,7 +66,7 @@ class MessageDao {
       },
       {
         where: {
-          [Sequelize.Op.in]: v.get("ids")
+          [Sequelize.Op.in]: v.get("body.ids")
         }
       }
     );

app/plugins/notify/app/sse.js

@@ -36,7 +36,7 @@ class EventDao {
   async createEvents (v) {
     const event = await Event.findOne({
       where: {
-        group_id: v.get("group_id")
+        group_id: v.get("body.group_id")
       }
     });
     if (event) {
@@ -45,22 +45,22 @@ class EventDao {
       });
     }
     const ev = new Event();
-    ev.group_id = v.get("group_id");
-    ev.message_events = v.get("events").join(",");
+    ev.group_id = v.get("body.group_id");
+    ev.message_events = v.get("body.events").join(",");
     ev.save();
   }
   async updateEvents (v) {
     const event = await Event.findOne({
       where: {
-        group_id: v.get("group_id")
+        group_id: v.get("body.group_id")
       }
     });
     if (!event) {
       throw new NotFound({
         msg: "当前权限组不存在推送项"
       });
     }
-    event.message_events = v.get("events").join(",");
+    event.message_events = v.get("body.events").join(",");
     event.save();
   }
 }