Merge branch 'SANDBOX'

app/controllers/admin/forumThread.js

@@ -1076,6 +1076,7 @@ router.get('/thread/:tid/exportComments', function(req, res, next) {
                     conf.cols = [
                         {caption:'楼层', type:'string'},
                         {caption:'发布时间', type:'Date'},
+                        {caption:'openId', type:'string'},
                         {caption:'会员名', type:'string'},
                         {caption:'内容', type:'string'},
                         {caption:'点赞数', type:'number'},
@@ -1090,7 +1091,8 @@ router.get('/thread/:tid/exportComments', function(req, res, next) {
 
                         var floor = comment.floor;
                         var time = date_format(comment.created);
-                        var nickName = comment.from.nickName || '';
+                        var openId = comment.from.uid || '';
+                        var nickName = comment.from.nickName || '游客';
                         var content = comment.content || '';
                         var praiseCount = comment.praiseCount || 0;
                         var praiseNames = '';
@@ -1106,7 +1108,8 @@ router.get('/thread/:tid/exportComments', function(req, res, next) {
                                 var sub_comment = comment.comments[k];
 
                                 var time = date_format(sub_comment.created);
-                                var nickName = sub_comment.from.nickName || '';
+                                var openId = sub_comment.from.uid || '';
+                                var nickName = sub_comment.from.nickName || '游客';
                                 var content = sub_comment.content || '';
 
                                 var this_row = ['子评论', time, nickName, content, null, null];

app/utils/user.js

@@ -15,55 +15,59 @@ exports.identifyUser=function() {
 
 	return function(req, res,next){
 		if(!req.session.mobileForumUser){
-			forumUserService.getUserByUid(req.session.openUser.openId,function(err,doc){
-				if(err){
-					next(err);
-				}else{
-					if(doc){
-						req.session.mobileForumUser={
-							userId:doc._id,
-							openId:doc.uid
-						};
-						if(req.session.source){
-							if(req.session.source !== req.session.mobileForumUser.userId){
-								req.session.mobileForumUser.source = req.session.source;
-								delete req.session.source;		
-							}
-						}
-						next(null);
+			if(req.session.openUser){
+				forumUserService.getUserByUid(req.session.openUser.openId,function(err,doc){
+					if(err){
+						next(err);
 					}else{
-						if(req.session.tmpOpenId){
+						if(doc){
+							req.session.mobileForumUser={
+								userId:doc._id,
+								openId:doc.uid
+							};
+							if(req.session.source){
+								if(req.session.source !== req.session.mobileForumUser.userId){
+									req.session.mobileForumUser.source = req.session.source;
+									delete req.session.source;		
+								}
+							}
 							next(null);
 						}else{
-							req.session.tmpOpenId=req.session.openUser.openId;
-							var entity={
-								uid:req.session.openUser.openId,
-								nickName:req.session.openUser.nickName,
-								icon:req.session.openUser.headPic,
-								ent_code:req.session.user.ent_code
-							};
-							forumUserService.createUser(entity,function(err,doc){
-								if(err){
-									next(null);
-								}else{
-									req.session.mobileForumUser={
-										userId:doc._id,
-										openId:doc.uid
-									};
-									if(req.session.source){
-										if(req.session.source !== req.session.mobileForumUser.userId){
-											req.session.mobileForumUser.source = req.session.source;
-											delete req.session.source;		
+							if(req.session.tmpOpenId){
+								next(null);
+							}else{
+								req.session.tmpOpenId=req.session.openUser.openId;
+								var entity={
+									uid:req.session.openUser.openId,
+									nickName:req.session.openUser.nickName,
+									icon:req.session.openUser.headPic,
+									ent_code:req.session.user.ent_code
+								};
+								forumUserService.createUser(entity,function(err,doc){
+									if(err){
+										next(null);
+									}else{
+										req.session.mobileForumUser={
+											userId:doc._id,
+											openId:doc.uid
+										};
+										if(req.session.source){
+											if(req.session.source !== req.session.mobileForumUser.userId){
+												req.session.mobileForumUser.source = req.session.source;
+												delete req.session.source;		
+											}
 										}
-									}
 
-									next(null);
-								}
-							});
+										next(null);
+									}
+								});
+							}
 						}
 					}
-				}
-			});
+				});
+			}else{
+				next('no openUser in session');
+			}
 		}else{
 			if(req.session.source){
 				if(req.session.source !== req.session.mobileForumUser.userId){