fix:修复日志搜索的参数位置

Author: pedro

app/api/cms/log.js

@@ -50,15 +50,15 @@ log.linGet(
   async ctx => {
     const v = await new LogFindValidator().validate(ctx);
     const keyword = get(ctx.request.query, "keyword", "");
-    const { logs, total } = await logDao.searchLogs(v, keyword);
+    const { rows, total } = await logDao.searchLogs(v, keyword);
     if (total < 1) {
       throw new NotFound({
         msg: "没有找到相关日志"
       });
     }
     ctx.json({
       total_nums: total,
-      collection: logs
+      collection: rows
     });
   }
 );

app/api/cms/user.js

@@ -6,7 +6,7 @@ const {
   getTokens,
   loginRequired,
   Success,
-  refreshTokenRequired,
+  refreshTokenRequiredWithUnifyException,
   Failed
 } = require("lin-mizar");
 
@@ -129,7 +129,7 @@ user.linGet(
     module: "用户",
     mount: false
   },
-  refreshTokenRequired,
+  refreshTokenRequiredWithUnifyException,
   async ctx => {
     let user = ctx.currentUser;
     const { accessToken, refreshToken } = getTokens(user);

app/dao/log.js

@@ -10,11 +10,11 @@ class LogDao {
     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"));
-    v.get("body.start") &&
-      v.get("body.end") &&
+    v.get("query.name") && set(condition, "user_name", v.get("query.name"));
+    v.get("query.start") &&
+      v.get("query.end") &&
       set(condition, "time", {
-        [Sequelize.Op.between]: [v.get("body.start"), v.get("body.end")]
+        [Sequelize.Op.between]: [v.get("query.start"), v.get("query.end")]
       });
     let { rows, count } = await Log.findAndCountAll({
       where: Object.assign({}, condition),
@@ -32,11 +32,11 @@ class LogDao {
     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"));
-    v.get("body.start") &&
-      v.get("body.end") &&
+    v.get("query.name") && set(condition, "user_name", v.get("query.name"));
+    v.get("query.start") &&
+      v.get("query.end") &&
       set(condition, "time", {
-        [Sequelize.Op.between]: [v.get("body.start"), v.get("body.end")]
+        [Sequelize.Op.between]: [v.get("query.start"), v.get("query.end")]
       });
     let { rows, count } = await Log.findAndCountAll({
       where: Object.assign({}, condition, {

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