Commit c1f30770 authored by 张淼's avatar 张淼

1

parent a5d369b4
...@@ -21,7 +21,7 @@ router.get('/user/get', function(req, res, next) { ...@@ -21,7 +21,7 @@ router.get('/user/get', function(req, res, next) {
var rs = {}; var rs = {};
async.parallel([ async.parallel([
function(cb){ function(cb){
forumUserService.getUserById(user.getMobileUser(),function(err,entity){ forumUserService.getUserById(user.getMobileUser(req),function(err,entity){
if (err) { if (err) {
cb(err,null); cb(err,null);
} else { } else {
...@@ -32,7 +32,7 @@ router.get('/user/get', function(req, res, next) { ...@@ -32,7 +32,7 @@ router.get('/user/get', function(req, res, next) {
function(cb){ function(cb){
var conditions={ var conditions={
ent_code:req.session.user.ent_code, ent_code:req.session.user.ent_code,
from:user.getMobileUser() from:user.getMobileUser(req)
}; };
forumThreadService.getAllCountByFid(conditions,function(err,count){ forumThreadService.getAllCountByFid(conditions,function(err,count){
if (err) { if (err) {
...@@ -51,6 +51,21 @@ router.get('/user/get', function(req, res, next) { ...@@ -51,6 +51,21 @@ router.get('/user/get', function(req, res, next) {
rs.myThreadCount=results[1] || 0; rs.myThreadCount=results[1] || 0;
res.json(_.assign(rs, returnCode.SUCCESS)); res.json(_.assign(rs, returnCode.SUCCESS));
} }
}); });
});
//获取用户信息
router.post('/user/:uid/update', function(req, res, next) {
var uid=req.params.uid;
if(uid){
forumUserService.updateUserById(uid,req.body,function(err,result){
if(err){
res.json(returnCode.BUSY);
}else{
res.json(returnCode.SUCCESS);
}
});
}else{
res.json(returnCode.WRONG_PARAM);
}
}); });
\ No newline at end of file
...@@ -28,6 +28,9 @@ var ForumUserSchema = new Schema({ ...@@ -28,6 +28,9 @@ var ForumUserSchema = new Schema({
displayIcon: { //自定义显示头像 displayIcon: { //自定义显示头像
type: String type: String
}, },
sex:{ //性别
type: Number
},
classLevel: { //等级,暂时不用 classLevel: { //等级,暂时不用
type: Number, type: Number,
require: true, require: true,
......
...@@ -44,3 +44,15 @@ exports.getUserById=function(id,callback){ ...@@ -44,3 +44,15 @@ exports.getUserById=function(id,callback){
} }
}); });
}; };
//根据ID更新用户信息
exports.updateUserById=function(uid,entity,callback){
ForumUser.update({ _id: uid}, entity,null,function(err,result){
if (err) {
console.error(err);
callback(err,null);
} else {
callback(null,null);
}
});
};
...@@ -2,16 +2,9 @@ ...@@ -2,16 +2,9 @@
var forumUserService=require('../service/forumUserService'); var forumUserService=require('../service/forumUserService');
exports.setUserSession=function(req,user){
req.session.forumUser=user;
};
exports.getUserSession=function(req){
return req.session.forumUser;
}
exports.getMobileUser=function(req){ exports.getMobileUser=function(req){
return req.session.mobileForumUser.userId; // return req.session.mobileForumUser.userId;
return '55015675868b65a028187c49';
} }
exports.getOpenId=function(req){ exports.getOpenId=function(req){
...@@ -45,7 +38,7 @@ exports.identifyUser=function() { ...@@ -45,7 +38,7 @@ exports.identifyUser=function() {
}; };
forumUserService.createUser(entity,function(err,doc){ forumUserService.createUser(entity,function(err,doc){
if(err){ if(err){
next(err); next(null);
}else{ }else{
req.session.mobileForumUser={ req.session.mobileForumUser={
userId:doc._id, userId:doc._id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment