Skip to content

P
pisns-forum-api
Commit e3bfbbfd authored by chrysan's avatar chrysan
1 Browse files
Options

Merge branch 'remould_1209_delete_common' of... 

Merge branch 'remould_1209_delete_common' of https://git.wxpai.cn/scrmgroup/pisns-forum-api into remould_1209_delete_common
parents 8373433c 211cd857
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 36 deletions
app/controllers/admin/forumIdentifyUser.js
View file @ e3bfbbfd
......@@ -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
View file @ e3bfbbfd
......@@ -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;
......@@ -620,6 +620,92 @@ router.get('/thread/:tid/comment/list/member/:mid', function(req, res, next) {
}
});
//查询评论列表
router.get('/thread/:tid/comment/listV2', function(req, res, next) {
var tid = req.params.tid || null,
pageNo = req.query.pageNo || 1,
pageSize = req.query.pageSize || 10,
mid = req.query.mid,
floor = req.query.floor,
content = req.query.content || '';
var conditions = {
ent_code: req.session.user.ent_code,
thread: tid
};
if (content) {
conditions.content = {
$regex: content,
$options: 'i'
};
}
if(floor){
conditions.level = '1';
conditions.floor = floor;
}
if (tid && mid) {
forumCommentService.getCommentListByMid(mid, conditions, pageNo, pageSize, function(err, results) {
if (err) {
console.error(err);
res.json(returnCode.BUSY);
} else {
var asyncTasks = [];
if (results.items && results.items[0] && results.items[0].comments.length > 0) {
var items = [results.items[0]];
_.forEach(results.items[0].comments, function(e) {
var subComment = e.toObject();
subComment.floor = results.items[0].floor;
if (content) {
if (subComment.content.indexOf(content) != -1) {
items.push(subComment);
}
} else {
items.push(subComment);
}
});
results.items = items;
results.total = items.length;
res.json(_.assign(results, returnCode.SUCCESS));
} else {
res.json(_.assign(results, returnCode.SUCCESS));
}
}
});
} else if(tid && floor){
forumCommentService.getAllComment(conditions, 1, 1, function(err, results) {
if (err) {
console.log(err);
res.json(returnCode.BUSY);
} else {
var asyncTasks = [];
if (results.items && results.items[0] && results.items[0].comments.length > 0) {
var items = [results.items[0]];
_.forEach(results.items[0].comments, function(e) {
var subComment = e.toObject();
subComment.floor = results.items[0].floor;
if (content) {
if (subComment.content.indexOf(content) != -1) {
items.push(subComment);
}
} else {
items.push(subComment);
}
});
results.items = items;
results.total = items.length;
res.json(_.assign(results, returnCode.SUCCESS));
} else {
res.json(_.assign(results, returnCode.SUCCESS));
}
}
});
} else {
res.json(returnCode.WRONG_PARAM);
}
});
// 更新评论状态
router.post('/thread/comment/update/:cid', function(req, res, next) {
var cid = req.params.cid || null;
......
app/service/forumCommentService.js
View file @ e3bfbbfd
......@@ -350,6 +350,7 @@ exports.getCommentList = function(conditions, pageNo, pageSize, callback) {
});
};
//获取评论列表
//获取评论列表
exports.getCommentListByMid = function(mid,conditions, pageNo, pageSize, callback) {
//查询到用户
forumUserService.searchMembersByMid(mid, function(err, users) {
......@@ -365,6 +366,7 @@ exports.getCommentListByMid = function(mid,conditions, pageNo, pageSize, callbac
conditions.from = {
$in:user_ids
}
countAll(conditions, function(err, count) {
if (err) {
callback(err);
......@@ -383,7 +385,34 @@ exports.getCommentListByMid = function(mid,conditions, pageNo, pageSize, callbac
obj.pageSize = pageSize;
obj.items = docs;
callback(null, obj);
if (docs && docs.length > 0) {
var asyncTasks = [];
docs.forEach(function(doc) {
asyncTasks.push(function(callback) {
populateComment(doc, function(err, c) {
if (err) {
callback(err, null);
} else {
var newobj = doc.toObject();
newobj.comments = (c == null ? [] : c);
callback(null, newobj);
}
});
});
});
async.parallel(asyncTasks, function(err, results) {
if (err) {
console.log(err);
callback(null, null);
} else {
obj.items = results;
callback(null, obj);
}
});
} else {
callback(null, obj);
}
}
});
}
......
config/express.js
View file @ e3bfbbfd
......@@ -74,12 +74,12 @@ module.exports = function(app, config) {
// exp: '100'
// };
if (!req.session.user && req.query.key && req.query.key === 'aiwanpai') {
if (!req.session.user && req.query.key && req.query.key === 'aiwanpai' && process.env.NODE_ENV !== 'production') {
req.session.user = {
ent_code: 100041
};
}
if (!req.session.openUser && req.query.key && req.query.key === 'aiwanpai') {
if (!req.session.openUser && req.query.key && req.query.key === 'aiwanpai' && process.env.NODE_ENV !== 'production') {
req.session.openUser = {
openId: '1111',
......
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