浏览代码

修改字段phone

liuyu 5 年之前
父节点
当前提交
638fc752b5
共有 4 个文件被更改,包括 17 次插入17 次删除
  1. 3 3
      app/controller/.user.js
  2. 1 1
      app/model/user.js
  3. 6 6
      app/service/login.js
  4. 7 7
      app/service/user.js

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

@@ -2,7 +2,7 @@ module.exports = {
   create: {
     requestBody: [
       '!name',
-      '!mobile',
+      '!phone',
       '!passwd',
       'openid',
       'roles',
@@ -18,7 +18,7 @@ module.exports = {
     params: ['!id'],
     requestBody: [
       'name',
-      'mobile',
+      'phone',
       'passwd',
       'openid',
       'uid',
@@ -37,7 +37,7 @@ module.exports = {
       query: {
         name:'%name%',
         uid: 'uid',
-        mobile:'mobile'
+        phone:'phone'
       }
     },
     service: 'query',

+ 1 - 1
app/model/user.js

@@ -6,7 +6,7 @@ const { Secret } = require('naf-framework-mongoose/lib/model/schema');
 // 用户表
 const UserSchema = {
   name: { type: String, required: false, maxLength: 200 }, // 名称
-  mobile: { type: String, required: true, maxLength: 64 }, // 手机
+  phone: { type: String, required: true, maxLength: 64 }, // 手机
   passwd: { type: Secret, select: false }, // 注册密码
   openid: { type: String, required: false }, // 微信openid
   uid: { type: String, required: false }, // 用户信息id

+ 6 - 6
app/service/login.js

@@ -17,14 +17,14 @@ class LoginService extends CrudService {
 
   // 用户登录
   async login(data) {
-    const { mobile, passwd } = data;
+    const { phone, passwd } = data;
     // 根据用户输入的手机号查询其他用户表中是否存在相应数据
-    const user = await this.model.findOne({ mobile });
+    const user = await this.model.findOne({ phone });
     // 如果用户不存在抛出异常
     if (!user) {
       throw new BusinessError(ErrorCode.USER_NOT_EXIST);
     }
-    const _user = await this.model.findOne({ mobile }, '+passwd');
+    const _user = await this.model.findOne({ phone }, '+passwd');
     // 将用户输入的密码进行加密并与查询到的用户数据密码相比对
     const pas = await this.createJwtPwd(passwd);
     // 如果两个密码不一致抛出异常
@@ -55,10 +55,10 @@ class LoginService extends CrudService {
   }
 
   // 创建登录Token
-  async createJwt({ id, name, mobile, roles, remark, openid }) {
+  async createJwt({ id, name, phone, roles, remark, openid }) {
     const { secret, expiresIn = '1d', issuer = type } = this.config.jwt;
-    const subject = mobile;
-    const res = { uid: id, name, mobile, roles, openid, remark };
+    const subject = phone;
+    const res = { uid: id, name, phone, roles, openid, remark };
     const token = await jwt.sign(res, secret, { expiresIn, issuer, subject });
     return token;
   }

+ 7 - 7
app/service/user.js

@@ -16,11 +16,11 @@ class UserService extends CrudService {
 
   // 重写创建方法
   async create(data) {
-    const { name, mobile, passwd } = data;
+    const { name, phone, passwd } = data;
     console.log(data);
-    assert(name && mobile && passwd, '缺少部分信息项');
-    assert(/^\d{11}$/i.test(mobile), 'mobile无效');
-    const user = await this.model.findOne({ mobile });
+    assert(name && phone && passwd, '缺少部分信息项');
+    assert(/^\d{11}$/i.test(phone), 'phone无效');
+    const user = await this.model.findOne({ phone });
     if (user) {
       throw new BusinessError(ErrorCode.DATA_EXISTED);
     }
@@ -40,13 +40,13 @@ class UserService extends CrudService {
 
   // 重写修改方法
   async update({ id }, data) {
-    const { name, mobile, passwd, openid, roles, remark, uid } = data;
+    const { name, phone, passwd, openid, roles, remark, uid } = data;
     const user = await this.model.findById(id, '+passwd');
     if (name) {
       user.name = name;
     }
-    if (mobile) {
-      user.mobile = mobile;
+    if (phone) {
+      user.phone = phone;
     }
     if (passwd) {
       const newpasswd = await this.createJwtPwd(passwd);