feat:更新validator的写法

Author: pedro

app/api/cms/admin.js

@@ -217,11 +217,10 @@ admin.linPost(
       throw new Failed({
         msg: "新建分组失败"
       });
-    } else {
-      ctx.success({
-        msg: "新建分组成功"
-      });
     }
+    ctx.success({
+      msg: "新建分组成功"
+    });
   }
 );
 

app/api/cms/log.js

@@ -3,7 +3,6 @@
 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");
 
 const log = new LinRouter({
@@ -47,7 +46,7 @@ log.linGet(
   groupRequired,
   async ctx => {
     const v = await new LogFindValidator().validate(ctx);
-    const keyword = get(ctx.request.query, "keyword", "");
+    const keyword = v.get("query.keyword", false, "");
     const { rows, total } = await logDao.searchLogs(v, keyword);
     if (total < 1) {
       throw new NotFound({

app/api/cms/user.js

@@ -101,16 +101,15 @@ user.linPut(
       v.get("body.old_password"),
       v.get("body.new_password")
     );
-    if (ok) {
-      user.save();
-      ctx.success({
-        msg: "密码修改成功"
-      });
-    } else {
+    if (!ok) {
       throw new Failed({
-        msg: "修改密码失败"
+        msg: "修改密码失败，你可能输入了错误的旧密码"
       });
     }
+    user.save();
+    ctx.success({
+      msg: "密码修改成功"
+    });
   }
 );
 

app/libs/util.js

@@ -13,4 +13,18 @@ function getSafeParamId (ctx) {
   return id;
 }
 
-module.exports = { getSafeParamId };
+function isOptional (val) {
+  // undefined , null , ""  , "    ", 皆通过
+  if (val === void 0) {
+    return true;
+  }
+  if (val === null) {
+    return true;
+  }
+  if (typeof val === "string") {
+    return val === "" || val.trim() === "";
+  }
+  return false;
+}
+
+module.exports = { getSafeParamId, isOptional };

app/plugins/notify/app/validators.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { LinValidator, Rule } = require("lin-mizar");
-const { extendedValidator } = require("lin-mizar/lin/extended-validator");
+const validator = require("validator");
 
 class EventsValidator extends LinValidator {
   constructor () {
@@ -14,16 +14,20 @@ class EventsValidator extends LinValidator {
 class IdsValidator extends LinValidator {
   constructor () {
     super();
-    this.ids = new Rule(this.checkIds, "每个id值必须为正整数");
+    this.ids = new Rule("isNotEmpty", "每个id值必须为正整数");
   }
 
-  checkIds (ids) {
+  validateIds (data) {
+    const ids = data.body.ids;
     if (!Array.isArray(ids)) {
-      return false;
+      return [false, "每个id值必须为正整数"];
     }
-    for (const id of ids) {
-      if (!extendedValidator.isInt2(id)) {
-        return false;
+    for (let id of ids) {
+      if (typeof id === "number") {
+        id = String(id);
+      }
+      if (!validator.isInt(id, { min: 1 })) {
+        return [false, "每个id值必须为正整数"];
       }
     }
     return true;

app/validators/admin.js

@@ -1,7 +1,6 @@
 "use strict";
 
-const { Rule, LinValidator } = require("lin-mizar");
-const { extendedValidator } = require("lin-mizar/lin/extended-validator");
+const { Rule, LinValidator, isNotEmpty } = require("lin-mizar");
 const { PaginateValidator, PositiveIdValidator } = require("./common");
 
 class AdminUsersValidator extends PaginateValidator {
@@ -22,17 +21,19 @@ class ResetPasswordValidator extends PositiveIdValidator {
       "密码长度必须在6~22位之间，包含字符、数字和 _ ",
       /^[A-Za-z0-9_*&$#@]{6,22}$/
     );
-    this.confirm_password = new Rule(
-      this.passwordCheck.bind(this),
-      "两次输入密码不一致"
-    );
+    this.confirm_password = new Rule("isNotEmpty", "确认密码不可为空");
   }
 
-  passwordCheck (val) {
-    if (!this.data.body.new_password || !this.data.body.confirm_password) {
-      return false;
+  validateConfirmPassword (data) {
+    if (!data.body.new_password || !data.body.confirm_password) {
+      return [false, "两次输入的密码不一致，请重新输入"];
+    }
+    let ok = data.body.new_password === data.body.confirm_password;
+    if (ok) {
+      return ok;
+    } else {
+      return [false, "两次输入的密码不一致，请重新输入"];
     }
-    return this.data.body.new_password === this.data.body.confirm_password;
   }
 }
 
@@ -58,15 +59,17 @@ class RemoveAuthsValidator extends LinValidator {
   constructor () {
     super();
     this.group_id = new Rule("isInt", "分组id必须正整数");
-    this.auths = new Rule(this.checkAuths, "请输入auths字段");
+    this.auths = new Rule("isNotEmpty", "请输入auths字段");
   }
-  checkAuths (auths) {
+
+  validateAuths (data) {
+    const auths = data.body.auths;
     if (!Array.isArray(auths)) {
-      return false;
+      return [false, "auths必须为非空数组"];
     }
-    for (const auth in auths) {
-      if (!extendedValidator.isNotEmpty(auth)) {
-        return false;
+    for (const auth of auths) {
+      if (!isNotEmpty(auth)) {
+        return [false, "auths必须为非空数组"];
       }
     }
     return true;
@@ -77,16 +80,17 @@ class DispatchAuthsValidator extends LinValidator {
   constructor () {
     super();
     this.group_id = new Rule("isInt", "分组id必须正整数");
-    this.auths = new Rule(this.checkAuths, "请输入auths字段");
+    this.auths = new Rule("isNotEmpty", "请输入auths字段");
   }
 
-  checkAuths (auths) {
+  validateAuths (data) {
+    const auths = data.body.auths;
     if (!Array.isArray(auths)) {
-      return false;
+      return [false, "auths必须为非空数组"];
     }
-    for (const auth in auths) {
-      if (!extendedValidator.isNotEmpty(auth)) {
-        return false;
+    for (const auth of auths) {
+      if (!isNotEmpty(auth)) {
+        return [false, "auths必须为非空数组"];
       }
     }
     return true;
@@ -98,19 +102,17 @@ class NewGroupValidator extends LinValidator {
     super();
     this.name = new Rule("isNotEmpty", "请输入分组名称");
     this.info = new Rule("isOptional");
-    this.auths = new Rule(this.checkAuths, "请输入auths字段");
+    this.auths = new Rule("isNotEmpty", "请输入auths字段");
   }
 
-  checkAuths (auths) {
+  validateAuths (data) {
+    const auths = data.body.auths;
     if (!Array.isArray(auths)) {
-      return false;
-    }
-    if (auths.length === 0) {
-      return true;
+      return [false, "auths必须为非空数组"];
     }
-    for (const auth in auths) {
-      if (!extendedValidator.isNotEmpty(auth)) {
-        return false;
+    for (const auth of auths) {
+      if (!isNotEmpty(auth)) {
+        return [false, "auths必须为非空数组"];
       }
     }
     return true;

app/validators/log.js

@@ -2,19 +2,39 @@
 
 const { Rule, checkDateFormat } = require("lin-mizar");
 const { PaginateValidator } = require("./common");
+const { isOptional } = require("../libs/util");
 
 class LogFindValidator extends PaginateValidator {
   constructor () {
     super();
     this.name = new Rule("isOptional");
-    this.start = [
-      new Rule("isOptional"),
-      new Rule(checkDateFormat, "请输入正确格式开始时间")
-    ];
-    this.end = [
-      new Rule("isOptional"),
-      new Rule(checkDateFormat, "请输入正确格式开始时间")
-    ];
+  }
+
+  validateStart (data) {
+    const start = data.query.start;
+    // 如果 start 为可选
+    if (isOptional(start)) {
+      return true;
+    }
+    const ok = checkDateFormat(start);
+    if (ok) {
+      return ok;
+    } else {
+      return [false, "请输入正确格式开始时间", "start"];
+    }
+  }
+
+  validateEnd (data) {
+    const end = data.query.start;
+    if (isOptional(end)) {
+      return true;
+    }
+    const ok = checkDateFormat(end);
+    if (ok) {
+      return ok;
+    } else {
+      return [false, "请输入正确格式结束时间", "end"];
+    }
   }
 }
 

app/validators/user.js

@@ -23,17 +23,19 @@ class RegisterValidator extends LinValidator {
         /^[A-Za-z0-9_*&$#@]{6,22}$/
       )
     ];
-    this.confirm_password = [
-      new Rule(this.passwordCheck.bind(this), "两次密码输入不一致")
-    ];
+    this.confirm_password = new Rule("isNotEmpty", "确认密码不可为空");
   }
 
-  passwordCheck (val) {
-    if (!this.data.body.password || !this.data.body.confirm_password) {
-      return false;
+  validateConfirmPassword (data) {
+    if (!data.body.password || !data.body.confirm_password) {
+      return [false, "两次输入的密码不一致，请重新输入"];
+    }
+    let ok = data.body.password === data.body.confirm_password;
+    if (ok) {
+      return ok;
+    } else {
+      return [false, "两次输入的密码不一致，请重新输入"];
     }
-    let ok = this.data.body.password === this.data.body.confirm_password;
-    return ok;
   }
 }
 
@@ -62,18 +64,20 @@ class ChangePasswordValidator extends LinValidator {
       "matches",
       "密码长度必须在6~22位之间，包含字符、数字和 _ "
     );
-    this.confirm_password = new Rule(
-      this.passwordCheck.bind(this),
-      "两次输入密码不一致"
-    );
+    this.confirm_password = new Rule("isNotEmpty", "确认密码不可为空");
     this.old_password = new Rule("isNotEmpty", "请输入旧密码");
   }
 
-  passwordCheck (val) {
-    if (!this.data.body.new_password || !this.data.body.confirm_password) {
-      return false;
+  validateConfirmPassword (data) {
+    if (!data.body.new_password || !data.body.confirm_password) {
+      return [false, "两次输入的密码不一致，请重新输入"];
+    }
+    let ok = data.body.new_password === data.body.confirm_password;
+    if (ok) {
+      return ok;
+    } else {
+      return [false, "两次输入的密码不一致，请重新输入"];
     }
-    return this.data.body.new_password === this.data.body.confirm_password;
   }
 }
 

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.22"
+    "lin-mizar": "^0.0.1-alpha.25"
   }
 }