Merge branch 'SANDBOX'

app/controllers/admin/forumIdentifyUser.js

@@ -37,7 +37,28 @@ function compareTime(now, begin_time, end_time) {
 	}
 }
 
-
+var updateUser = function(uid,nickName,icon){
+	var entity = {},
+		isUpdate = false;
+	if(nickName){
+		entity.nickName = nickName;
+		isUpdate = true;
+	}
+	if(icon){
+		entity.icon = icon;
+		isUpdate = true;
+	}
+	if(isUpdate){
+		forumUserService.updateUserById(uid,entity,function(err,result){
+			if(err){
+				console.log(err);
+			}else{
+				console.log('用户:'+uid+'---------更新成功');
+				console.log(entity);
+			}
+		});
+	}
+}
 //验证用户身份
 router.post('/user/identifyUser',function(req,res,next){
 	var entity=req.body;
@@ -50,6 +71,11 @@ router.post('/user/identifyUser',function(req,res,next){
 					res.json('error');
 				}else{
 					if(doc){
+						if(entity.nickName || entity.icon){
+							if(doc.nickName !== entity.nickName || doc.icon !== entity.icon){
+								updateUser(doc._id,entity.nickName,entity.icon);	
+							}	
+						}
 						req.session.mobileForumUser={
 							userId:doc._id,
 							openId:doc.uid

app/utils/user.js

@@ -10,25 +10,7 @@ exports.getMobileUser=function(req){
 exports.getOpenId=function(req){
 	return req.session.mobileForumUser.openId;
 }
-var updateUser = function(uid,nickName,icon,cb){
-	var entity = {},
-		isUpdate = false;
-	if(nickName){
-		entity.nickName = nickName;
-		isUpdate = true;
-	}
-	if(icon){
-		entity.icon = icon;
-		isUpdate = true;
-	}
-	if(isUpdate){
-		forumUserService.updateUserById(uid,entity,function(err,result){
-			if(err){
-				console.log(err);
-			}
-		});
-	}
-}
+
 exports.identifyUser=function() {
 
 	return function(req, res,next){
@@ -38,7 +20,6 @@ exports.identifyUser=function() {
 					next(err);
 				}else{
 					if(doc){
-						updateUser(doc._id,req.session.openUser.nickName,req.session.openUser.icon,function(){});
 						req.session.mobileForumUser={
 							userId:doc._id,
 							openId:doc.uid