Merge pull request #40 from TaleLin/dev

Dev

Author: vanoneang

app/api/cms/admin.js

@@ -75,9 +75,12 @@ admin.linGet(
       v.get('query.count')
     );
     ctx.json({
-      collection: users,
+      items: users,
       // 超级管理员不算入总数
-      total_nums: total
+      total: total,
+      page: v.get('query.page'),
+      count: v.get('query.count'),
+      total_page: Math.ceil(total / parseInt(v.get('query.count')))
     });
   }
 );
@@ -159,8 +162,11 @@ admin.linGet(
       });
     }
     ctx.json({
-      collection: groups,
-      total_nums: total
+      items: groups,
+      total: total,
+      page: v.get('query.page'),
+      count: v.get('query.count'),
+      total_page: Math.ceil(total / parseInt(v.get('query.count')))
     });
   }
 );

app/api/cms/file.js

@@ -1,17 +1,13 @@
 'use strict';
 
-const { LinRouter, ParametersException } = require('lin-mizar');
-// const { ratelimit } = require('lin-mizar/lin/limiter');
+const { LinRouter, ParametersException, loginRequired } = require('lin-mizar');
 const { LocalUploader } = require('../../extensions/file/local-uploader');
-// const redis = require('redis');
-
-// const client = redis.createClient();
 
 const file = new LinRouter({
   prefix: '/cms/file'
 });
 
-file.post('/', async ctx => {
+file.linPost('upload', '/', {}, loginRequired, async ctx => {
   const files = await ctx.multipart();
   if (files.length < 1) {
     throw new ParametersException({ msg: '未找到符合条件的文件资源' });
@@ -21,20 +17,4 @@ file.post('/', async ctx => {
   ctx.json(arr);
 });
 
-// file.get(
-//   '/',
-//   ratelimit({
-//     db: client,
-//     duration: 30 * 1000,
-//     max: 5,
-//     // throw: true,
-//     logging: true
-//   }),
-//   async ctx => {
-//     ctx.body = {
-//       msg: 'just a normal response.'
-//     };
-//   }
-// );
-
 module.exports = { file };

app/api/cms/log.js

@@ -29,8 +29,11 @@ log.linGet(
       });
     }
     ctx.json({
-      total_nums: total,
-      collection: rows
+      total: total,
+      items: rows,
+      page: v.get('query.page'),
+      count: v.get('query.count'),
+      total_page: Math.ceil(total / parseInt(v.get('query.count')))
     });
   }
 );
@@ -54,8 +57,11 @@ log.linGet(
       });
     }
     ctx.json({
-      total_nums: total,
-      collection: rows
+      total: total,
+      items: rows,
+      page: v.get('query.page'),
+      count: v.get('query.count'),
+      total_page: Math.ceil(total / parseInt(v.get('query.count')))
     });
   }
 );

app/api/cms/test.js

@@ -29,7 +29,7 @@ test.linGet(
     mount: true
   },
   loginRequired,
-  logger('{user.nickname}就是皮了一波'),
+  logger('{user.username}就是皮了一波'),
   async ctx => {
     ctx.json({
       msg: '物质决定意识，经济基础决定上层建筑'

app/api/cms/user.js

@@ -57,7 +57,7 @@ user.linPost(
   async ctx => {
     const v = await new LoginValidator().validate(ctx);
     let user = await ctx.manager.userModel.verify(
-      v.get('body.nickname'),
+      v.get('body.username'),
       v.get('body.password')
     );
     const { accessToken, refreshToken } = getTokens(user);

app/api/v1/book.js

@@ -39,11 +39,11 @@ bookApi.get('/:id', async ctx => {
 
 bookApi.get('/', async ctx => {
   const books = await bookDto.getBooks();
-  if (!books || books.length < 1) {
-    throw new NotFound({
-      msg: '没有找到相关书籍'
-    });
-  }
+  // if (!books || books.length < 1) {
+  //   throw new NotFound({
+  //     msg: '没有找到相关书籍'
+  //   });
+  // }
   ctx.json(books);
 });
 

app/config/secure.js

@@ -7,7 +7,7 @@ module.exports = {
     dialect: 'mysql',
     port: 3306,
     username: 'root',
-    password: '123456',
+    password: 'root',
     logging: false,
     timezone: '+08:00'
   },

app/config/setting.js

@@ -1,17 +1,8 @@
 'use strict';
 
-let siteDomain;
-switch (process.env.NODE_ENV) {
-  case 'development':
-    siteDomain = 'http://localhost:5000/';
-    break;
-  case 'production':
-    siteDomain = '';
-    break;
-}
 module.exports = {
   port: 5000,
-  siteDomain,
+  siteDomain: 'http://localhost:5000',
   countDefault: 10,
   pageDefault: 0,
   apiDir: 'app/api',

app/dao/user.js

@@ -8,7 +8,7 @@ class UserDao {
   async createUser (ctx, v) {
     let user = await ctx.manager.userModel.findOne({
       where: {
-        nickname: v.get('body.nickname')
+        username: v.get('body.username')
       }
     });
     if (user) {
@@ -33,7 +33,7 @@ class UserDao {
 
   async updateUser (ctx, v) {
     let user = ctx.currentUser;
-    if (user.email !== v.get('body.email')) {
+    if (v.get('body.email') && user.email !== v.get('body.email')) {
       const exit = await ctx.manager.userModel.findOne({
         where: {
           email: v.get('body.email')
@@ -44,8 +44,11 @@ class UserDao {
           msg: '邮箱已被注册，请重新输入邮箱'
         });
       }
+      user.email = v.get('body.email');
+    }
+    if (v.get('body.nickname')) {
+      user.nickname = v.get('body.nickname')
     }
-    user.email = v.get('body.email');
     user.save();
   }
 
@@ -56,8 +59,16 @@ class UserDao {
         group_id: user.group_id
       }
     });
+    let group = await ctx.manager.groupModel.findOne({
+      where: {
+        id: user.group_id
+      }
+    })
     const aus = this.splitAuths(auths);
     set(user, 'auths', aus);
+    if (group) {
+      set(user, 'groupName', group.name);
+    }
     return user;
   }
 
@@ -88,7 +99,7 @@ class UserDao {
 
   registerUser (ctx, v) {
     const user = new ctx.manager.userModel();
-    user.nickname = v.get('body.nickname');
+    user.username = v.get('body.username');
     user.password = v.get('body.password');
     user.group_id = v.get('body.group_id');
     if (v.get('body.email') && v.get('body.email').trim() !== '') {

app/plugins/notify/app/middleware.js

@@ -42,7 +42,7 @@ function pushMessage (template, event, ctx, extra) {
   msg.time = now;
   msg.pushed = MessageIsPushed.PUSHED;
   msg.user_id = ctx.currentUser.id;
-  msg.user_name = ctx.currentUser.nickname;
+  msg.user_name = ctx.currentUser.username;
   msg.save();
 }