Merge branch 'Notice' into SANDBOX

app/controllers/mobile/commentTips.js

 'use strict';
 var express = require('express'),
 	router = express.Router(),
+	user = require('../../utils/user'),
 	returnCode = require('../../utils/returnCode'),
 	commentTips = require('../../utils/commentTips'),
 	_ = require('lodash');
@@ -10,8 +11,9 @@ module.exports = function(app) {
 };
 
 router.get('/commentTips', function(req, res, next) {
-	var openId = req.session.openUser.openId;
-	commentTips.get(openId,function(err,result){
+	var userId = user.getMobileUser(req);
+	var entcode = req.session.user.ent_code;
+	commentTips.get(entcode,userId,function(err,result){
 		if(err){
 			res.json(returnCode.UNCHECK_ERROR(err));
 		}else{
@@ -20,9 +22,10 @@ router.get('/commentTips', function(req, res, next) {
 	});
 });
 
-router.put('/commentTips', function(req, res, next) {
-	var openId = req.session.openUser.openId;
-	commentTips.incrTips(openId,function(err,result){
+router.put('/commentTips/:id', function(req, res, next) {
+	var userId = req.params.id;
+	var entcode = req.session.user.ent_code;
+	commentTips.incrTips(entcode,userId,function(err,result){
 		if(err){
 			res.json(returnCode.UNCHECK_ERROR(err));
 		}else{
@@ -32,8 +35,9 @@ router.put('/commentTips', function(req, res, next) {
 });
 
 router.put('/commentTips/del', function(req, res, next) {
-	var openId = req.session.openUser.openId;
-	commentTips.clear(openId,function(err,result){
+	var userId = user.getMobileUser(req);
+	var entcode = req.session.user.ent_code;
+	commentTips.clear(entcode,userId,function(err,result){
 		if(err){
 			res.json(returnCode.UNCHECK_ERROR(err));
 		}else{

app/controllers/mobile/forumThread.js

@@ -14,7 +14,7 @@ var forumShareLogService = require('../../service/forumShareLogService');
 var forumCommentService = require('../../service/forumCommentService');
 var forumUserThreadControlService = require('../../service/forumUserThreadControlService');
 var forumLimitActionRefService = require('../../service/forumLimitActionRefService');
-
+var commentTips = require('../../utils/commentTips');
 var httpService = require('../../service/httpService');
 
 var user = require('../../utils/user');
@@ -505,6 +505,8 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
                                                                 if (err) {
                                                                     callback(err, null);
                                                                 } else {
+																	//
+																	commentTips.incrTips(req.session.user.ent_code,thread.from);
                                                                     var comments = thread.comments;
                                                                     // console.log('=========');
                                                                     // console.log(comments);
@@ -664,6 +666,7 @@ router.post('/thread/:tid/comment/:cid/create', function(req, res, next) {
                                                         if (err) {
                                                             callback(err, null);
                                                         } else {
+															commentTips.incrTips(req.session.user.ent_code,req.body.to);
                                                             var comments = comment.comments;
                                                             var array = [];
                                                             if (comments && comments.length > 0) {

app/utils/commentTips.js

 'use strict';
 
 var redis=global.redis;
-var prefix = 'comment-tips-';
-
-function getKey(openId){
-	return prefix + openId;
+var prefix = '_forum_comment_count_';
+var expire = 60*60*24*180;
+function getKey(entcode,userId){
+	return entcode + prefix + userId;
 }
 
-exports.clear = function(openId,callback){
-	var key = getKey(openId);
+exports.clear = function(entcode,userId,callback){
+	var key = getKey(entcode,userId);
 	if(!redis){
 		console.log('redis error');
 		return callback && callback('error');
@@ -18,19 +18,21 @@ exports.clear = function(openId,callback){
     });
 };
 
-exports.incrTips=function(openId,callback){
-	var key = getKey(openId);
+exports.incrTips=function(entcode,userId,callback){
+	var key = getKey(entcode,userId);
 	if(!redis){
 		console.log('redis error');
 		return callback && callback('error');
 	}
 	redis.incr(key, function(error, res){
+		redis.expire(key, expire);
 		return callback && callback(error, !!res);
     });
+	
 };
 
-exports.get=function(openId,callback){
-	var key = getKey(openId);
+exports.get=function(entcode,userId,callback){
+	var key = getKey(entcode,userId);
 	if(!redis){
 		console.log('redis error');
 		return callback && callback('error');