fix: 解决user和sign的循环引用

This commit is contained in:
chaosBreaking
2019-09-06 23:07:43 +08:00
parent 9ab55805de
commit 8724afbeb7
3 changed files with 13 additions and 8 deletions

View File

@@ -2,8 +2,8 @@ const Crypto = require('../../utils/crypto');
const { createToken } = require('../../utils/jwt'); const { createToken } = require('../../utils/jwt');
const { inject } = require('../../common/Provider'); const { inject } = require('../../common/Provider');
const User = require('../user/user.model'); const User = require('../user/user.model');
const { createNewUser } = require('../user/user.handler');
const Code = require('../msgCode/msgCode.controller'); const Code = require('../msgCode/msgCode.controller');
const { createNewUser } = require('../user/user.controller');
const Fund = require('../fund/fund.model'); const Fund = require('../fund/fund.model');
const CODE_TYPE = Code.CODE_TYPE; const CODE_TYPE = Code.CODE_TYPE;

View File

@@ -5,13 +5,6 @@ const Crypto = require('../../utils/crypto');
module.exports = { module.exports = {
changePwd, changePwd,
async createNewUser (data) {
const { phone, inviter = '', password, inviteCode } = data;
return await (new User({ phone, inviter, password, inviteCode })).save().then(user => user).catch(err => {
mylog.error('创建新用户失败', err);
throw new Error('创建新用户失败', err.errmsg);
});
},
async getUserInfo (req, res) { async getUserInfo (req, res) {
const { userId } = res.locals.user; const { userId } = res.locals.user;
User.findById(userId, 'id nickname phone').then(data => { User.findById(userId, 'id nickname phone').then(data => {

View File

@@ -0,0 +1,12 @@
'use strict';
const User = require('./user.model');
module.exports = {
async createNewUser (data) {
const { phone, inviter = '', password, inviteCode } = data;
return await (new User({ phone, inviter, password, inviteCode })).save().then(user => user).catch(err => {
mylog.error('创建新用户失败', err);
throw new Error('创建新用户失败', err.errmsg);
});
},
};