Commit 67031ac4 authored by strong's avatar strong

Merge commit '9df1cb01' into SANDBOX

parents 7d12781f 9df1cb01
...@@ -296,7 +296,7 @@ router.get('/sharev2.js', function(req, res, next) { ...@@ -296,7 +296,7 @@ router.get('/sharev2.js', function(req, res, next) {
var _v = new Date().getTime();//用于sharelog 版本号 var _v = new Date().getTime();//用于sharelog 版本号
var share_log = {_v:_v}; var share_log = {_v:_v};
req.session.shareLog = {_v:_v};//新的分享对象 req.session.shareLog = {_v:_v};//新的分享对象
console.log('新的分享对象:',req.session.shareLog); console.log('forumshare 1',req.session.shareLog);
var rs = {}, var rs = {},
type = req.query.type, type = req.query.type,
id = req.query.id, id = req.query.id,
...@@ -423,7 +423,7 @@ router.get('/sharev2.js', function(req, res, next) { ...@@ -423,7 +423,7 @@ router.get('/sharev2.js', function(req, res, next) {
share_log.info = id; share_log.info = id;
//替换分享log内容 //替换分享log内容
if(!req.session.shareLog || !req.session.shareLog._v || _v >= req.session.shareLog._v){ if(!req.session.shareLog || !req.session.shareLog._v || _v >= req.session.shareLog._v){
console.log('分享日志:',share_log); console.log('forumshare 2',share_log);
req.session.shareLog = share_log; req.session.shareLog = share_log;
} }
if(forumInfo.share_type && forumInfo.share_type == 1){ if(forumInfo.share_type && forumInfo.share_type == 1){
...@@ -453,7 +453,7 @@ router.get('/sharev2.js', function(req, res, next) { ...@@ -453,7 +453,7 @@ router.get('/sharev2.js', function(req, res, next) {
share_log.thread_type = thread.pid?4:thread.type; share_log.thread_type = thread.pid?4:thread.type;
//替换分享log内容 //替换分享log内容
if(!req.session.shareLog || !req.session.shareLog._v || _v >= req.session.shareLog._v){ if(!req.session.shareLog || !req.session.shareLog._v || _v >= req.session.shareLog._v){
console.log('分享日志:',share_log); console.log('forumshare 3',share_log);
req.session.shareLog = share_log; req.session.shareLog = share_log;
} }
//组装分享路径与判断分享类型 //组装分享路径与判断分享类型
......
...@@ -142,7 +142,7 @@ exports.createLog = function(req,source,info,type,thread_type,thread,p_thread) { ...@@ -142,7 +142,7 @@ exports.createLog = function(req,source,info,type,thread_type,thread,p_thread) {
}; };
exports.createShareLog = function(req,share_type) { exports.createShareLog = function(req,share_type) {
console.log('分享日志:',req.session.shareLog); console.log('forumshare 4',req.session.shareLog);
var logObj = req.session.shareLog || {}; var logObj = req.session.shareLog || {};
logObj.source = req.session.mobileForumUser.source; logObj.source = req.session.mobileForumUser.source;
logObj.mid = req.session.openUser.mid; logObj.mid = req.session.openUser.mid;
......
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