Merge branch 'remould_1210_icon_diff' into SANDBOX

app/controllers/admin/forumIdentifyUser.js

@@ -63,48 +63,87 @@ var updateUser = function(user,entity){
 					console.log(err);
 				}else{
 					console.log('用户:'+user._id+'---------更新成功');
-					console.log(updateObj);
+					// console.log(updateObj);
 				}
 			});
 		}
 	}	
 }
+//验证用户身份
+// router.post('/user/identifyUser',function(req,res,next){
+// 	var entity=req.body;
+// 	if(req.session.mobileForumUser && req.session.mobileForumUser.openId === entity.openId){
+// 		res.json({result:'success',userId:req.session.mobileForumUser.userId});
+// 	}else if(!req.session.mobileForumUser || req.session.mobileForumUser.openId !== entity.openId){
+// 			forumUserService.getUserByUid(entity.uid,function(err,doc){
+// 				if(err){
+// 					console.error(err);
+// 					res.json('error');
+// 				}else{
+// 					if(doc){
+// 						updateUser(doc,entity);	
+// 						req.session.mobileForumUser={
+// 							userId:doc._id,
+// 							openId:doc.uid,
+// 							mid:doc.mid || entity.mid
+// 						};
+// 						res.json({result:'success',userId:doc._id});
+// 					}else{
+// 						forumUserService.createUser(entity,function(err,doc){
+// 							if(err){
+// 								console.error(err);
+// 								res.json('error');
+// 							}else{
+// 								req.session.mobileForumUser={
+// 									userId:doc._id,
+// 									openId:doc.uid,
+// 									mid:doc.mid
+// 								};
+// 								res.json({result:'success',userId:doc._id});
+// 							}
+// 						});
+// 					}
+// 				}
+// 			});
+// 	}else{
+// 		res.json({result:'success',userId:req.session.mobileForumUser.userId});
+// 	}
+// });
+
 //验证用户身份
 router.post('/user/identifyUser',function(req,res,next){
 	var entity=req.body;
-	if(req.session.mobileForumUser && req.session.mobileForumUser.openId === entity.openId){
-		res.json({result:'success',userId:req.session.mobileForumUser.userId});
-	}else if(!req.session.mobileForumUser || req.session.mobileForumUser.openId !== entity.openId){
-			forumUserService.getUserByUid(entity.uid,function(err,doc){
-				if(err){
-					console.error(err);
-					res.json('error');
+	if(entity){
+		forumUserService.getUserByUid(entity.uid,function(err,doc){
+			if(err){
+				console.error(err);
+				res.json('error');
+			}else{
+				if(doc){
+					updateUser(doc,entity);	
+					req.session.mobileForumUser={
+						userId:doc._id,
+						openId:doc.uid,
+						mid:doc.mid || entity.mid
+					};
+					res.json({result:'success',userId:doc._id});
 				}else{
-					if(doc){
-						updateUser(doc,entity);	
-						req.session.mobileForumUser={
-							userId:doc._id,
-							openId:doc.uid,
-							mid:doc.mid || entity.mid
-						};
-						res.json({result:'success',userId:doc._id});
-					}else{
-						forumUserService.createUser(entity,function(err,doc){
-							if(err){
-								console.error(err);
-								res.json('error');
-							}else{
-								req.session.mobileForumUser={
-									userId:doc._id,
-									openId:doc.uid,
-									mid:doc.mid
-								};
-								res.json({result:'success',userId:doc._id});
-							}
-						});
-					}
+					forumUserService.createUser(entity,function(err,doc){
+						if(err){
+							console.error(err);
+							res.json('error');
+						}else{
+							req.session.mobileForumUser={
+								userId:doc._id,
+								openId:doc.uid,
+								mid:doc.mid
+							};
+							res.json({result:'success',userId:doc._id});
+						}
+					});
 				}
-			});
+			}
+		});
 	}else{
 		res.json({result:'success',userId:req.session.mobileForumUser.userId});
 	}

app/controllers/admin/forumThread.js

@@ -58,7 +58,7 @@ router.post('/thread/create', function(req, res, next) {
     var rs = {},
         ent_code = req.session.user.ent_code,
         icon = req.session.user.headPic,
-        nickName = req.session.user.name;
+        nickName = req.session.user.nickName;
     if (icon && icon.indexOf('http://') == -1) {
         if (process.env.NODE_ENV === 'production') {
             icon = 'http://fs.wxpai.cn/' + icon;