Переглянути джерело

修改管理员密码字段的key

lrf 3 роки тому
батько
коміт
609cc4dcd7

+ 3 - 3
app/controller/user/config/.admin.js

@@ -1,6 +1,6 @@
 module.exports = {
   create: {
-    requestBody: ['!name', '!phone', '!passwd', 'openid', '!role', 'menus', '!pid', 'deptname', 'code', 'isdel', 'remark', 'role_id'],
+    requestBody: ['!name', '!phone', '!password', 'openid', '!role', 'menus', '!pid', 'deptname', 'code', 'isdel', 'remark', 'role_id'],
   },
   destroy: {
     params: ['!id'],
@@ -45,12 +45,12 @@ module.exports = {
   //修改密码
   password: {
     params: ['!id'],
-    requestBody: ['passwd'],
+    requestBody: ['password'],
     service: 'password',
   },
   // 登陆
   login: {
-    requestBody: ['code_phone', 'passwd'],
+    requestBody: ['code_phone', 'password'],
     service: 'login',
   },
 };

+ 1 - 1
app/model/user/admin.js

@@ -8,7 +8,7 @@ const { Secret } = require('naf-framework-mongoose-free/lib/model/schema');
 const admin = {
   name: { type: String }, // 名称
   phone: { type: String }, // 手机
-  passwd: { type: Secret, select: false }, // 注册密码
+  password: { type: Secret, select: false }, // 注册密码
   openid: { type: String }, // 微信openid
   role: { type: String }, // 角色: 0:超级管理员;1:管理员;2:机构管理员;3:业务管理员
   menus: { type: [ String ] }, // 菜单

+ 11 - 11
app/service/user/admin.js

@@ -42,8 +42,8 @@ class AdminService extends CrudService {
    * 创建用户
    * @param {Object} params 用户信息
    */
-  async create({ passwd, ...data }) {
-    data.passwd = { secret: passwd };
+  async create({ password, ...data }) {
+    data.password = { secret: password };
     const { phone, pid, code } = data;
     // 检查手机号
     let num = await this.model.count({ phone });
@@ -75,27 +75,27 @@ class AdminService extends CrudService {
   }
   /**
    * 修改密码
-   * @param {Object} {id,passwd} 用户id和密码
+   * @param {Object} {id,password} 用户id和密码
    */
-  async password({ id, passwd }) {
+  async password({ id, password }) {
     const object = await this.model.findById(id);
     if (!object) throw new BusinessError(ErrorCode.DATA_NOT_EXIST, '未找到用户的信息');
-    object.passwd = { secret: passwd };
+    object.password = { secret: password };
     await object.save();
   }
   /**
    * 管理员登陆
    * @param {Object} params 登陆信息
    * @property code_phone code或者是phone
-   * @property passwd 密码
+   * @property password 密码
    */
-  async login({ code_phone, passwd }) {
-    const object = await this.model.findOne({ $or: [{ code: code_phone }, { phone: code_phone }] }, '+passwd');
+  async login({ code_phone, password }) {
+    const object = await this.model.findOne({ $or: [{ code: code_phone }, { phone: code_phone }] }, '+password');
     if (!object) throw new BusinessError(ErrorCode.DATA_NOT_EXIST, '未找到用户的信息');
-    const { passwd: op } = object;
+    const { password: op } = object;
     const { secret } = op;
-    if (secret !== passwd) throw new BusinessError(ErrorCode.BAD_PASSWORD, '密码错误');
-    const data = _.omit(JSON.parse(JSON.stringify(object)), [ 'meta', 'passwd', '__v' ]);
+    if (secret !== password) throw new BusinessError(ErrorCode.BAD_PASSWORD, '密码错误');
+    const data = _.omit(JSON.parse(JSON.stringify(object)), [ 'meta', 'password', '__v' ]);
     const { secret: secrets } = this.config.jwt;
     const menus = await this.ctx.model.System.Menu.find({ _id: object.menus.map(i => ObjectId(i)) }).sort({ sort: 1 });
     data.menus = menus;