Commit 78acbf19 authored by 陈志良's avatar 陈志良

Merge branch 'remould_0727_topic_cache' into SANDBOX

parents 9b937834 3eab2e24
...@@ -329,37 +329,45 @@ exports.getThreadById = function(tid, callback) { ...@@ -329,37 +329,45 @@ exports.getThreadById = function(tid, callback) {
} }
}); });
}, },
// function(cb) { function(cb) {
// //获取话题子文章列表 //获取话题子文章列表
// var conditions ={} var conditions ={}
// if(doc.type == 2){ if(doc.type == 2){
// conditions = { conditions = {
// pid: tid, pid: tid,
// type: 2, type: 2,
// status:1 status:1
// }; };
// }else if(doc.type == 3){ }else if(doc.type == 3){
// conditions = { conditions = {
// pid: tid, pid: tid,
// type: 3, type: 3,
// status:1, status:1,
// images: {$exists: true, $not: {$size: 0}} images: {$exists: true, $not: {$size: 0}}
// }; };
// }else{ }else{
// cb(null, null); cb(null, null);
// return; return;
// } }
var key = 'pisns-forum-thread:' + tid + ':subThreads';
// getAllThreadByFidHelp(conditions, 1, 10, null, function(err, threads) { redis.get(key,function(err,value){
// if (err) { if (value) {
// console.error(err); cb(null, JSON.parse(value));
// cb(err, null); } else {
// } else { getAllThreadByFidHelp(conditions, 1, 10, null, function(err, threads) {
// cb(null, threads); if (err) {
// } console.error(err);
// }); cb(err, null);
// }, } else {
redis.set(key, JSON.stringify(threads));
redis.expire(key, 10);
cb(null, threads);
}
});
}
});
},
// function(cb) { // function(cb) {
//获取照片墙最新文章列表 //获取照片墙最新文章列表
// if (doc.type !== 3) { // if (doc.type !== 3) {
...@@ -462,7 +470,7 @@ exports.getThreadById = function(tid, callback) { ...@@ -462,7 +470,7 @@ exports.getThreadById = function(tid, callback) {
} else { } else {
var thread = doc; var thread = doc;
var comments = results[0] || []; var comments = results[0] || [];
// var subThreads = results[1] || []; //话题子文章列表 var subThreads = results[1] || []; //话题子文章列表
// var latestPhotos = results[2] || []; //最新照片墙列表 // var latestPhotos = results[2] || []; //最新照片墙列表
// var hotPhotos = results[3] || []; //最热照片墙列表 // var hotPhotos = results[3] || []; //最热照片墙列表
var canyuPeopleCount = results[1] || 0; //参与人数 var canyuPeopleCount = results[1] || 0; //参与人数
......
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