Merge pull request #7 from TaleLin/dev

Dev

Author: pedro

README.md

@@ -2,15 +2,15 @@
   <a href="http://doc.cms.7yue.pro/">
   <img src="http://doc.cms.7yue.pro/left-logo.png" width="250"/></a>
   <br>
-  Lin-CMS-Koa （测试版）
+  Lin-CMS-Koa
 </h1>
 
 <h4 align="center">一个简单易用的CMS后端项目 | <a href="http://doc.cms.7yue.pro/" target="_blank">Lin-CMS-Koa</a></h4>
 
 <p align="center">
   <a href="http://flask.pocoo.org/docs/1.0/" rel="nofollow">
   <img src="https://img.shields.io/badge/koa-2.7.0-green.svg" alt="flask version" data-canonical-src="https://img.shields.io/badge/koa-2.7.0-green.svg" style="max-width:100%;"></a>
-  <a href="https://pypi.org/project/Lin-CMS/" rel="nofollow"><img src="https://img.shields.io/badge/lin--cms--test-0.0.1--alpha8-red.svg" alt="lin-cms version" data-canonical-src="https://img.shields.io/badge/lin--cms--test-0.0.1--alpha8-red.svg" style="max-width:100%;"></a>
+  <a href="https://pypi.org/project/Lin-CMS/" rel="nofollow"><img src="https://img.shields.io/badge/lin--mizar-0.1.1-green.svg" alt="lin-cms version" data-canonical-src="https://img.shields.io/badge/lin--cms--test-0.0.1--alpha8-red.svg" style="max-width:100%;"></a>
   <a href="http://doc.cms.7yue.pro/" rel="nofollow"><img src="https://img.shields.io/badge/license-MIT-lightgrey.svg" alt="LISENCE" data-canonical-src="https://img.shields.io/badge/license-MIT-lightgrey.svg" style="max-width:100%;"></a>
 </p>
 

app/api/cms/admin.js

@@ -4,7 +4,6 @@ const {
   LinRouter,
   routeMetaInfo,
   adminRequired,
-  Success,
   NotFound,
   Failed
 } = require("lin-mizar");
@@ -95,11 +94,9 @@ admin.linPut(
   async ctx => {
     const v = await new ResetPasswordValidator().validate(ctx);
     await adminDao.changeUserPassword(ctx, v);
-    ctx.json(
-      new Success({
-        msg: "密码修改成功"
-      })
-    );
+    ctx.success({
+      msg: "密码修改成功"
+    });
   }
 );
 
@@ -116,11 +113,9 @@ admin.linDelete(
     const v = await new PositiveIdValidator().validate(ctx);
     const id = v.get("path.id");
     await adminDao.deleteUser(ctx, id);
-    ctx.json(
-      new Success({
-        msg: "操作成功"
-      })
-    );
+    ctx.success({
+      msg: "操作成功"
+    });
   }
 );
 
@@ -136,11 +131,9 @@ admin.linPut(
   async ctx => {
     const v = await new UpdateUserInfoValidator().validate(ctx);
     await adminDao.updateUserInfo(ctx, v);
-    ctx.json(
-      new Success({
-        msg: "操作成功"
-      })
-    );
+    ctx.success({
+      msg: "操作成功"
+    });
   }
 );
 
@@ -221,18 +214,13 @@ admin.linPost(
     const v = await new NewGroupValidator().validate(ctx);
     const ok = await adminDao.createGroup(ctx, v);
     if (!ok) {
-      ctx.json(
-        new Failed({
-          msg: "新建分组失败"
-        })
-      );
-    } else {
-      ctx.json(
-        new Success({
-          msg: "新建分组成功"
-        })
-      );
+      throw new Failed({
+        msg: "新建分组失败"
+      });
     }
+    ctx.success({
+      msg: "新建分组成功"
+    });
   }
 );
 
@@ -248,11 +236,9 @@ admin.linPut(
   async ctx => {
     const v = await new UpdateGroupValidator().validate(ctx);
     await adminDao.updateGroup(ctx, v);
-    ctx.json(
-      new Success({
-        msg: "更新分组成功"
-      })
-    );
+    ctx.success({
+      msg: "更新分组成功"
+    });
   }
 );
 
@@ -269,11 +255,9 @@ admin.linDelete(
     const v = await new PositiveIdValidator().validate(ctx);
     const id = v.get("path.id");
     await adminDao.deleteGroup(ctx, id);
-    ctx.json(
-      new Success({
-        msg: "删除分组成功"
-      })
-    );
+    ctx.success({
+      msg: "删除分组成功"
+    });
   }
 );
 
@@ -289,11 +273,9 @@ admin.linPost(
   async ctx => {
     const v = await new DispatchAuthValidator().validate(ctx);
     await adminDao.dispatchAuth(ctx, v);
-    ctx.json(
-      new Success({
-        msg: "添加权限成功"
-      })
-    );
+    ctx.success({
+      msg: "添加权限成功"
+    });
   }
 );
 
@@ -309,11 +291,9 @@ admin.linPost(
   async ctx => {
     const v = await new DispatchAuthsValidator().validate(ctx);
     await adminDao.dispatchAuths(ctx, v);
-    ctx.json(
-      new Success({
-        msg: "添加权限成功"
-      })
-    );
+    ctx.success({
+      msg: "添加权限成功"
+    });
   }
 );
 
@@ -329,11 +309,9 @@ admin.linPost(
   async ctx => {
     const v = await new RemoveAuthsValidator().validate(ctx);
     await adminDao.removeAuths(ctx, v);
-    ctx.json(
-      new 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

@@ -6,11 +6,9 @@ const {
   getTokens,
   loginRequired,
   adminRequired,
-  Success,
   refreshTokenRequiredWithUnifyException,
   Failed,
-  logger,
-  checkUserIsActive
+  logger
 } = require("lin-mizar");
 
 const {
@@ -41,11 +39,9 @@ user.linPost(
   async ctx => {
     const v = await new RegisterValidator().validate(ctx);
     await userDao.createUser(ctx, v);
-    ctx.json(
-      new Success({
-        msg: "用户创建成功"
-      })
-    );
+    ctx.success({
+      msg: "用户创建成功"
+    });
   }
 );
 
@@ -58,7 +54,6 @@ user.linPost(
     mount: false
   },
   async ctx => {
-    checkUserIsActive(ctx.currentUser);
     const v = await new LoginValidator().validate(ctx);
     let user = await ctx.manager.userModel.verify(
       v.get("body.nickname"),
@@ -84,11 +79,9 @@ user.linPut(
   async ctx => {
     const v = await new UpdateInfoValidator().validate(ctx);
     await userDao.updateUser(ctx, v);
-    ctx.json(
-      new Success({
-        msg: "操作成功"
-      })
-    );
+    ctx.success({
+      msg: "操作成功"
+    });
   }
 );
 
@@ -108,20 +101,15 @@ user.linPut(
       v.get("body.old_password"),
       v.get("body.new_password")
     );
-    if (ok) {
-      user.save();
-      ctx.json(
-        new Success({
-          msg: "密码修改成功"
-        })
-      );
-    } else {
-      ctx.json(
-        new Failed({
-          msg: "修改密码失败"
-        })
-      );
+    if (!ok) {
+      throw new Failed({
+        msg: "修改密码失败，你可能输入了错误的旧密码"
+      });
     }
+    user.save();
+    ctx.success({
+      msg: "密码修改成功"
+    });
   }
 );
 

app/api/v1/book.js

@@ -3,7 +3,6 @@
 const {
   LinRouter,
   NotFound,
-  Success,
   groupRequired,
   disableLoading
 } = require("lin-mizar");
@@ -61,22 +60,18 @@ bookApi.get("/search/one", async ctx => {
 bookApi.post("/", async ctx => {
   const v = await new CreateOrUpdateBookValidator().validate(ctx);
   await bookDto.createBook(v);
-  ctx.json(
-    new Success({
-      msg: "新建图书成功"
-    })
-  );
+  ctx.success({
+    msg: "新建图书成功"
+  });
 });
 
 bookApi.put("/:id", async ctx => {
   const v = await new CreateOrUpdateBookValidator().validate(ctx);
   const id = getSafeParamId(ctx);
   await bookDto.updateBook(v, id);
-  ctx.json(
-    new Success({
-      msg: "更新图书成功"
-    })
-  );
+  ctx.success({
+    msg: "更新图书成功"
+  });
 });
 
 bookApi.linDelete(
@@ -92,11 +87,9 @@ bookApi.linDelete(
     const v = await new PositiveIdValidator().validate(ctx);
     const id = v.get("path.id");
     await bookDto.deleteBook(id);
-    ctx.json(
-      new Success({
-        msg: "删除图书成功"
-      })
-    );
+    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/message.js

@@ -1,12 +1,6 @@
 "use strict";
 
-const {
-  LinRouter,
-  loginRequired,
-  NotFound,
-  paginate,
-  Success
-} = require("lin-mizar");
+const { LinRouter, loginRequired, NotFound, paginate } = require("lin-mizar");
 const { getSafeParamId } = require("../../../libs/util");
 const { IdsValidator } = require("./validators");
 const { MessageDao } = require("./message-dao");
@@ -53,11 +47,9 @@ messageApi.linPut(
   async ctx => {
     const id = getSafeParamId(ctx);
     await messageDao.readMessage(id);
-    ctx.json(
-      new Success({
-        msg: "操作成功"
-      })
-    );
+    ctx.success({
+      msg: "操作成功"
+    });
   }
 );
 
@@ -73,11 +65,9 @@ messageApi.linPut(
   async ctx => {
     const v = await new IdsValidator().validate(ctx);
     await messageDao.readMessages(v);
-    ctx.json(
-      new Success({
-        msg: "操作成功"
-      })
-    );
+    ctx.success({
+      msg: "操作成功"
+    });
   }
 );
 
@@ -93,11 +83,9 @@ messageApi.linDelete(
   async ctx => {
     const id = getSafeParamId(ctx);
     await messageDao.deleteMessage(id);
-    ctx.json(
-      new Success({
-        msg: "操作成功"
-      })
-    );
+    ctx.success({
+      msg: "操作成功"
+    });
   }
 );