diff --git a/server/controllers/user.js b/server/controllers/user.js index 3d5f4e5e..cb2f59a9 100644 --- a/server/controllers/user.js +++ b/server/controllers/user.js @@ -42,7 +42,7 @@ class userController extends baseController{ this.setLoginCookie(result._id, result.passsalt) return ctx.body = yapi.commons.resReturn({ - username: username, + username: result.username, uid: result._id, email: result.email, add_time: result.add_time, @@ -83,7 +83,6 @@ class userController extends baseController{ if (!error && response.statusCode == 200) { let result = JSON.parse(body); if(result && result.ret === true){ - console.log(result) let ret = { email: result.userId + '@qunar.com', username: result.data.userInfo.name @@ -148,6 +147,10 @@ class userController extends baseController{ } } + /** + * 修改用户密码 + * @param {*} ctx + */ async changePassword(ctx){ let params = ctx.request.body; var userInst = yapi.getInst(userModel); diff --git a/server_dist/controllers/user.js b/server_dist/controllers/user.js index 504872e5..f2011768 100644 --- a/server_dist/controllers/user.js +++ b/server_dist/controllers/user.js @@ -129,7 +129,7 @@ var userController = function (_baseController) { this.setLoginCookie(result._id, result.passsalt); return _context.abrupt('return', ctx.body = _yapi2.default.commons.resReturn({ - username: username, + username: result.username, uid: result._id, email: result.email, add_time: result.add_time, @@ -207,7 +207,6 @@ var userController = function (_baseController) { if (!error && response.statusCode == 200) { var result = JSON.parse(body); if (result && result.ret === true) { - console.log(result); var ret = { email: result.userId + '@qunar.com', username: result.data.userInfo.name @@ -340,6 +339,12 @@ var userController = function (_baseController) { return handleThirdLogin; }() + + /** + * 修改用户密码 + * @param {*} ctx + */ + }, { key: 'changePassword', value: function () {