Skip to content

P
pisns-forum-api
Commit 3f70ee4e authored by 刘文胜's avatar 刘文胜
Browse files
Options

Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development

parents adc59954 8eb70843
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 21 deletions
app/controllers/admin/forumThread.js
View file @ 3f70ee4e
......@@ -30,7 +30,9 @@ router.post('/thread/create', function(req, res, next) {
var rs = {};
req.body.ent_code = req.session.user.ent_code;
if(!req.body.share){
delete req.body.share;
}
var uid = req.session.user.id;
// var uid='12345';
if (req.body.pid) {
......@@ -81,7 +83,9 @@ router.post('/thread/create', function(req, res, next) {
}
});
}
}); } }
});
}
}
});
});
......@@ -113,10 +117,21 @@ router.get('/thread/:tid/get', function(req, res, next) {
if (err) {
res.json(returnCode.BUSY);
} else {
if (results[0].pid) {
forumThreadService.getById(results[0].pid, function(err, parentThread) {
rs.data = results[0];
rs.tagList = results[1];
rs.parentThread = parentThread;
res.json(_.assign(rs, returnCode.SUCCESS));
});
} else {
rs.data = results[0];
rs.tagList = results[1];
res.json(_.assign(rs, returnCode.SUCCESS));
}
}
});
} else {
res.json(returnCode.WRONG_PARAM);
......@@ -229,7 +244,7 @@ router.get('/threads/list', function(req, res, next) {
conditions.level = 2;
}
if(content){
if (content) {
conditions.content = {
$regex: content,
$options: 'i'
......@@ -241,8 +256,17 @@ router.get('/threads/list', function(req, res, next) {
console.error(err);
res.json(returnCode.BUSY);
} else {
if (results.items.length>0 &&results.items[0].pid) {
forumThreadService.getById(results.items[0].pid, function(err, parentThread) {
res.json(_.assign({
parentThread: parentThread
}, results, returnCode.SUCCESS));
});
} else {
res.json(_.assign(results, returnCode.SUCCESS));
}
}
});
});
......@@ -298,7 +322,7 @@ router.post('/thread/comment/update/:cid', function(req, res, next) {
forumThreadService.getById(tid, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
res.json(returnCode.BUSY);
} else {
result.comment_count -= 1;
var commentList = result.comments;
......@@ -306,7 +330,7 @@ router.post('/thread/comment/update/:cid', function(req, res, next) {
forumThreadService.updateThreadById(tid, result, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
res.json(returnCode.BUSY);
} else {
res.json(returnCode.SUCCESS);
}
......@@ -316,9 +340,9 @@ router.post('/thread/comment/update/:cid', function(req, res, next) {
} else { // 删除子评论
// 更新文章评论 - 1
forumThreadService.updateThreadCommentCount(tid, comment_count - 1, function(err, result) {
forumThreadService.updateThreadCommentCount(tid, function(err, result) {
if (err) {
callback(err, null);
res.json(returnCode.BUSY);
}
});
......@@ -327,7 +351,7 @@ router.post('/thread/comment/update/:cid', function(req, res, next) {
forumCommentService.getCommentById(parent_cid, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
res.json(returnCode.BUSY);
} else {
var commentList = result.comments;
result.comments = forumCommentService.remove(commentList, cid);
......@@ -372,7 +396,14 @@ router.post('/thread/comment/update/:cid/comments', function(req, res, next) {
});
// 更新评论对象
// result.comment_count+=1; // 回复评论+1
forumCommentService.updateCommentById(cid, {$push:{comments:replayComment_id},$inc:{comment_count:1}}, function(err, result) {
forumCommentService.updateCommentById(cid, {
$push: {
comments: replayComment_id
},
$inc: {
comment_count: 1
}
}, function(err, result) {
if (err) {
console.error(err);
res.json(returnCode.BUSY);
......@@ -390,15 +421,15 @@ router.post('/thread/comment/update/:cid/comments', function(req, res, next) {
forumCommentService.getCommentById(cid, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
res.json(returnCode.BUSY);
} else {
var commentList = result.comments;
result.comments.push(replayComment_id);
forumCommentService.updateCommentById(cid, result, function(err, result) {
if (err) {
console.error(err);
res.json(returnCode.BUSY);
} else {
res.json(returnCode.SUCCESS);
......@@ -455,6 +486,7 @@ router.post('/thread/comment/add', function(req, res, next) {
};
forumUserService.createUser(userentity, function(err, doc) {
if (err) {
console.log(err);
res.json(returnCode.BUSY);
} else {
entity.from = doc._id;
......@@ -510,7 +542,7 @@ router.post('/thread/:tid/updateComments', function(req, res, next) {
forumThreadService.getById(tid, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
res.json(returnCode.BUSY);
} else {
result.comments.push(cid);
result.comment_count += 1;
......@@ -518,7 +550,7 @@ router.post('/thread/:tid/updateComments', function(req, res, next) {
forumThreadService.updateThreadById(tid, result, function(err, result) {
if (err) {
console.error(err);
callback(err, null);
res.json(returnCode.BUSY);
} else {
res.json(returnCode.SUCCESS);
}
......
app/service/forumThreadService.js
View file @ 3f70ee4e
......@@ -674,12 +674,17 @@ exports.updateThreadCommentCountInc = function(threadId, callback) {
};
//更新文章评论数
exports.updateThreadCommentCount = function(threadId, comment_count, callback) {
exports.updateThreadCommentCount = function(threadId, callback) {
ForumThread.update({
_id: threadId
}, {
'comment_count': comment_count
}, null,
$inc: {
comment_count: -1
}
}, {
w: 1,
safe: true
},
function(err, result) {
if (err) {
console.error(err);
......
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