liuyu il y a 5 ans
Parent
commit
710663cd87
4 fichiers modifiés avec 10 ajouts et 10 suppressions
  1. 2 2
      app/controller/.user.js
  2. 1 1
      app/model/user.js
  3. 4 4
      app/service/login.js
  4. 3 3
      app/service/user.js

+ 2 - 2
app/controller/.user.js

@@ -5,7 +5,7 @@ module.exports = {
       '!phone',
       '!passwd',
       'openid',
-      'roles',
+      'role',
       'uid',
       'remark'
     ]
@@ -22,7 +22,7 @@ module.exports = {
       'passwd',
       'openid',
       'uid',
-      'roles',
+      'role',
       'remark'
     ]
   },

+ 1 - 1
app/model/user.js

@@ -10,7 +10,7 @@ const UserSchema = {
   passwd: { type: Secret, select: false }, // 注册密码
   openid: { type: String, required: false }, // 微信openid
   uid: { type: String, required: false }, // 用户信息id
-  roles: { type: [ String ], required: false }, // 权限
+  role: { type: [ String ], required: false }, // 权限
   remark: { type: String, required: false }, // 备注
 };
 

+ 4 - 4
app/service/login.js

@@ -35,13 +35,13 @@ class LoginService extends CrudService {
     const state = uuid();
     const key = `free:auth:state:${state}`;
     const _roles = [];
-    for (const elm of user.roles) {
+    for (const elm of user.role) {
       const role = await this.rmodel.findById({ _id: ObjectId(elm) });
       if (role) {
         _roles.push(role);
       }
     }
-    user.roles = _roles;
+    user.role = _roles;
     const token = await this.createJwt(user);
     await this.app.redis.set(key, token, 'EX', 60 * 60 * 24);
     return { key };
@@ -55,10 +55,10 @@ class LoginService extends CrudService {
   }
 
   // 创建登录Token
-  async createJwt({ id, name, phone, roles, remark, openid }) {
+  async createJwt({ id, name, phone, role, remark, openid }) {
     const { secret, expiresIn = '1d', issuer = type } = this.config.jwt;
     const subject = phone;
-    const res = { uid: id, name, phone, roles, openid, remark };
+    const res = { uid: id, name, phone, role, openid, remark };
     const token = await jwt.sign(res, secret, { expiresIn, issuer, subject });
     return token;
   }

+ 3 - 3
app/service/user.js

@@ -40,7 +40,7 @@ class UserService extends CrudService {
 
   // 重写修改方法
   async update({ id }, data) {
-    const { name, phone, passwd, openid, roles, remark, uid } = data;
+    const { name, phone, passwd, openid, role, remark, uid } = data;
     const user = await this.model.findById(id, '+passwd');
     if (name) {
       user.name = name;
@@ -55,8 +55,8 @@ class UserService extends CrudService {
     if (openid) {
       user.openid = openid;
     }
-    if (roles) {
-      user.roles = roles;
+    if (role) {
+      user.role = role;
     }
     if (uid) {
       user.uid = uid;