Merge branch 'Gabriel_0831'

Conflicts:
	app/service/forumThreadService.js

app/controllers/admin/forumLog.js

@@ -44,7 +44,7 @@ var aggregate = function(model, match, group_id, sort, callback) {
 
 //格式化日期 (格式：年-月-日)
 function date_format(date) {
-    return moment(date).format('YYYY/MM/DD');
+    return moment(date).format('YYYYMMDD');
 }
 
 //获取日期之间所有日期

app/controllers/mobile/forumInfo.js

@@ -567,7 +567,7 @@ router.get('/info/myAttend', function(req, res, next) {
                         });
                         cont(null,threadIds);  
                     }else{
-                        res.json(_.assign({data:[],total:0}, returnCode.SUCCESS));
+                        res.json(_.assign({items:[],total:0}, returnCode.SUCCESS));
                     }
                 }
             });

app/controllers/mobile/forumThread.js

@@ -32,6 +32,8 @@ function create(req, callback) {
         entity.pid = null;
     }
 
+
+
     var address = entity.address || null;
     if (address) {
         entity.address = JSON.parse(address);
@@ -54,7 +56,30 @@ function create(req, callback) {
         entity.images = array;
     }
     //-----------处理前端上传图片结束
-
+    if(entity.pid && entity.type == 3 ){
+        forumThreadService.getByConditions({type:3,level:'2',pid:entity.pid,from:entity.from},function(err,doc){
+            if(doc){
+                var update = {
+                    $set:{
+                        images:entity.images,
+                        content:entity.content
+                    }
+                };
+                forumThreadService.updateThreadById(doc._id,update,function(err,updatedDoc){
+                        callback(err,entity);
+                });
+            }else{
+                forumThreadService.createThread(entity, function(err, entity) {
+                    if (err) {
+                        console.error(err);
+                        callback(err, null);
+                    } else {
+                        callback(null, entity);
+                    }
+                });
+            }
+        });
+    }else{
         forumThreadService.createThread(entity, function(err, entity) {
             if (err) {
                 console.error(err);
@@ -63,6 +88,7 @@ function create(req, callback) {
                 callback(null, entity);
             }
         });    
+    }
 }
 
 //根据发帖者分页查询话题列表
@@ -235,6 +261,26 @@ router.get('/thread/:tid/get', function(req, res, next) {
     }
 });
 
+//获取目标论坛文章
+router.get('/thread/photo/:pid/get', function(req, res, next) {
+    var pid = req.params.pid || null,
+        userId = req.session.mobileForumUser.userId;;
+    if (pid) {
+        forumThreadService.getByConditions({type:3,level:'2',pid:pid,from:userId},function(err,thread){
+            if (err) {
+                console.error(err);
+                res.json(returnCode.BUSY);
+            } else {
+                var rs = {};
+                rs.data = thread;
+                res.json(_.assign(rs, returnCode.SUCCESS));
+            }    
+        });
+    } else {
+        res.json(returnCode.WRONG_PARAM);
+    }
+});
+
 //更新文章状态、如：屏蔽
 router.post('/thread/:tid/update', function(req, res, next) {
     var tid = req.params.tid;
@@ -1339,4 +1385,3 @@ router.post('/thread/:tid/disable', function(req, res, next) {
         res.json(returnCode.WRONG_PARAM);
     }
 });
-

app/service/forumThreadService.js

@@ -122,7 +122,17 @@ exports.getById = function(id, callback) {
         }
     });
 }
-
+//根据ID获取文章记录，不查评论，子话题
+exports.getByConditions = function(conditions, callback) {
+    ForumThread.findOne(conditions, function(err, result) {
+        if (err) {
+            console.error(err);
+            callback(err, null);
+        } else {
+            callback(null, result);
+        }
+    });
+}
 //根据ID获取文章
 exports.getThreadById = function(tid, callback) {
     async.parallel([
@@ -632,7 +642,7 @@ function getAllThreadByFidHelp(conditions, pageNo, pageSize, sort, callback) {
                 path: 'comments',
                 options: {
                     where:{status:1},
-                    limit: 3,
+                    limit: 5,
                     sort: '-created'
                 },
                 select: 'from to created content level'
@@ -995,7 +1005,7 @@ function getAllThreadByFidHelpAndNickName(user_ids, conditions, pageNo, pageSize
                 path: 'comments',
                 options: {
                     where:{status:1},
-                    limit: 3,
+                    limit: 5,
                     sort: '-created'
                 },
                 select: 'from to created content'
@@ -1034,3 +1044,4 @@ exports.getAllThreadByFidAndNickName = function(nickName, conditions, pageNo, pa
     
     });
 }
+//获取某个文章

config/config.js

@@ -67,7 +67,7 @@ var config = {
     app: {
       name: 'pisns-forum-api'
     },
-    service:'http://pisns.wxpai.cn',
+    service:'http://piplus.wxpai.cn',
     port: 3011,
 
     mongodb: {

config/express.js

@@ -60,14 +60,14 @@ module.exports = function(app, config) {
     res.header('Access-Control-Max-Age', 7200);
     next();
   });
-	if(app.get('env') === 'development'){
 	app.use(function(req, res, next) {
-			 if (!req.session.user ) {
+     if (!req.session.user && req.query.key && req.query.key === 'aiwanpai') {
        req.session.user = {
-				 ent_code: 100001
+         ent_code: 100041
        };
      }
-			 if (!req.session.openUser) {
+     if (!req.session.openUser &&  req.query.key && req.query.key === 'aiwanpai') {
+   
        req.session.openUser = {
          openId: '1111',
          integral: '100',
@@ -76,7 +76,6 @@ module.exports = function(app, config) {
      }
      next(null);
    });
-	}
 	
 //设置创建用户中间件
 app.use('/v1/forum/*',forumUser.identifyUser());