Parcourir la source

修改登录信息

liuyu il y a 5 ans
Parent
commit
5ff3372988
3 fichiers modifiés avec 12 ajouts et 5 suppressions
  1. 1 1
      app/controller/.role.js
  2. 2 2
      app/router.js
  3. 9 2
      app/service/login.js

+ 1 - 1
app/controller/.role.js

@@ -27,7 +27,7 @@ module.exports = {
   index: {
     parameters: {
       query: {
-        name:'%role_name%',
+        role_name:'%role_name%',
         url:'code'
       }
     },

+ 2 - 2
app/router.js

@@ -8,8 +8,8 @@ module.exports = app => {
   router.get('/', controller.home.index);
 
   // 权限表设置路由
-  router.resources('role', '/api/auth/role', controller.user); // index、create、show、destroy
-  router.post('role', '/api/auth/role/update/:id', controller.user.update);
+  router.resources('role', '/api/auth/role', controller.role); // index、create、show、destroy
+  router.post('role', '/api/auth/role/update/:id', controller.role.update);
 
   // 用户表设置路由
   router.resources('user', '/api/auth/user', controller.user); // index、create、show、destroy

+ 9 - 2
app/service/login.js

@@ -2,6 +2,7 @@
 
 const assert = require('assert');
 const _ = require('lodash');
+const { ObjectId } = require('mongoose').Types;
 const { CrudService } = require('naf-framework-mongoose/lib/service');
 const { BusinessError, ErrorCode } = require('naf-core').Error;
 const jwt = require('jsonwebtoken');
@@ -33,9 +34,15 @@ class LoginService extends CrudService {
     // 取出用户的类型,根据用户类型返回相应信息
     const state = uuid();
     const key = `free:auth:state:${state}`;
+    const _roles = [];
+    for (const elm of user.roles) {
+      const role = await this.rmodel.findById({ _id: ObjectId(elm) });
+      if (role) {
+        _roles.push(role);
+      }
+    }
+    user.roles = _roles;
     const token = await this.createJwt(user);
-    console.log('key--' + key);
-    console.log('token--' + token);
     await this.app.redis.set(key, token, 'EX', 60 * 60 * 24);
     return { key };
   }