Commit d5f3c817 authored by 陈家荣's avatar 陈家荣

jjj

parent b47a2d08
...@@ -258,7 +258,7 @@ router.get('/thread/:tid/comment/list', function(req, res, next) { ...@@ -258,7 +258,7 @@ router.get('/thread/:tid/comment/list', function(req, res, next) {
}; };
if (tid) { if (tid) {
//获取最新5条评论 //获取最新5条评论
forumCommentService.getAllComment(conditions, pageNo, pageSize, function(err, results) { forumCommentService.getAllComment(conditions, pageNo, pageSize, function(err, results) {
if (err) { if (err) {
console.log(err); console.log(err);
...@@ -302,8 +302,8 @@ router.post('/thread/comment/update/:cid', function(req, res, next) { ...@@ -302,8 +302,8 @@ router.post('/thread/comment/update/:cid', function(req, res, next) {
console.error(err); console.error(err);
callback(err, null); callback(err, null);
} else { } else {
res.json(returnCode.SUCCESS); res.json(returnCode.SUCCESS);
} }
}); });
} }
}); });
...@@ -313,7 +313,7 @@ router.post('/thread/comment/update/:cid', function(req, res, next) { ...@@ -313,7 +313,7 @@ router.post('/thread/comment/update/:cid', function(req, res, next) {
forumThreadService.updateThreadCommentCount(tid, comment_count - 1, function(err, result) { forumThreadService.updateThreadCommentCount(tid, comment_count - 1, function(err, result) {
if (err) { if (err) {
callback(err, null); callback(err, null);
} }
}); });
// 更新评论的子评论列表 // 更新评论的子评论列表
...@@ -351,104 +351,128 @@ router.post('/thread/comment/update/:cid', function(req, res, next) { ...@@ -351,104 +351,128 @@ router.post('/thread/comment/update/:cid', function(req, res, next) {
// 更新回复评论 // 更新回复评论
router.post('/thread/comment/update/:cid/comments', function(req, res, next) { router.post('/thread/comment/update/:cid/comments', function(req, res, next) {
var tid = req.body.tid || null; var tid = req.body.tid || null;
var cid = req.params.cid || null; var cid = req.params.cid || null;
var replayComment_id = req.body.replayComment_id; var replayComment_id = req.body.replayComment_id;
// 获取评论的子评论列表 // 获取评论的子评论列表
forumCommentService.getCommentById(cid, function(err, result) { forumCommentService.getCommentById(cid, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
} else {
// 更新文章评论 + 1
forumThreadService.updateThreadCommentCountInc(tid, function(err, thread) {
if (err) { if (err) {
console.error(err);
callback(err, null); callback(err, null);
}
});
// 更新评论对象
result.comments.push(replayComment_id); // 添加子评论ID
// result.comment_count+=1; // 回复评论+1
forumCommentService.updateCommentById(cid, result, function(err, result) {
if (err) {
res.json(returnCode.BUSY);
} else { } else {
res.json(returnCode.SUCCESS); // 更新文章评论 + 1
forumThreadService.updateThreadCommentCountInc(tid, function(err, thread) {
if (err) {
callback(err, null);
}
});
// 更新评论对象
result.comments.push(replayComment_id); // 添加子评论ID
// result.comment_count+=1; // 回复评论+1
forumCommentService.updateCommentById(cid, result, function(err, result) {
if (err) {
res.json(returnCode.BUSY);
} else {
res.json(returnCode.SUCCESS);
}
});
} }
}); });
} router.post('/thread/comment/update/:cid/comments', function(req, res, next) {
}); var cid = req.params.cid || null;
var replayComment_id = req.body.replayComment_id;
// 获取评论的子评论列表
forumCommentService.getCommentById(cid, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
} else {
var commentList = result.comments;
});
//添加评论 result.comments.push(replayComment_id);
router.post('/thread/comment/add', function(req, res, next) {
var tid = req.body.tid || null;
var entity = req.body;
var ip = getClientIP(req);
entity.created = new Date();
entity.ent_code = req.session.user.ent_code;
entity.ip = ip;
// entity.from = req.session.mobileForumUser.userId; // 正式环境
entity.from = '55015675868b65a028187c49'; // 测试环境
if (tid) {
// 添加评论
forumCommentService.createComment(entity, function(err, result) {
if (err) {
res.json(returnCode.BUSY);
} else {
var returnData = {
comment:  result,
errorcode: 0,
errormsg: '请求成功'
}
res.json(returnData);
}
});
}
});
forumCommentService.updateCommentById(cid, result, function(err, result) {
if (err) {
res.json(returnCode.BUSY);
} else {
res.json(returnCode.SUCCESS);
}
});
// 更新文章评论 }
router.post('/thread/:tid/updateComments', function(req, res, next) { });
var tid = req.params.tid || null; });
var cid = req.body.cid || null;
// 获取评论的子评论列表
forumThreadService.getById(tid, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
} else {
result.comments.push(cid);
result.comment_count += 1;
forumThreadService.updateThreadById(tid, result, function(err, result) { //添加评论
if (err) { router.post('/thread/comment/add', function(req, res, next) {
console.error(err); var tid = req.body.tid || null;
callback(err, null); var entity = req.body;
} else { var ip = getClientIP(req);
res.json(returnCode.SUCCESS); entity.created = new Date();
entity.ent_code = req.session.user.ent_code;
entity.ip = ip;
// entity.from = req.session.mobileForumUser.userId; // 正式环境
entity.from = '55015675868b65a028187c49'; // 测试环境
if (tid) {
// 添加评论
forumCommentService.createComment(entity, function(err, result) {
if (err) {
res.json(returnCode.BUSY);
} else {
var returnData = {
comment:  result,
errorcode: 0,
errormsg: '请求成功'
}
res.json(returnData);
}
});
} }
}); });
}
});
});
// 更新文章评论
router.post('/thread/:tid/updateComments', function(req, res, next) {
var tid = req.params.tid || null;
var cid = req.body.cid || null;
// 获取评论的子评论列表
forumThreadService.getById(tid, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
} else {
result.comments.push(cid);
result.comment_count += 1;
forumThreadService.updateThreadById(tid, result, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
} else {
res.json(returnCode.SUCCESS);
}
});
}
});
var getClientIP = function(req) { });
var ipAddress;
var headers = req.headers;
var forwardedIpsStr = headers['x-real-ip'] || headers['x-forwarded-for'];
if (forwardedIpsStr) { var getClientIP = function(req) {
ipAddress = forwardedIpsStr; var ipAddress;
} else { var headers = req.headers;
ipAddress = null; var forwardedIpsStr = headers['x-real-ip'] || headers['x-forwarded-for'];
} if (forwardedIpsStr) {
if (!ipAddress) { ipAddress = forwardedIpsStr;
ipAddress = req.connection.remoteAddress; } else {
} ipAddress = null;
return ipAddress; }
}; if (!ipAddress) {
ipAddress = req.connection.remoteAddress;
}
return ipAddress;
};
});
\ No newline at end of file
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