Merge commit '9df1cb01'

app/controllers/mobile/forumShare.js

@@ -293,11 +293,10 @@ function getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,forumThre
 //微信分享接口V2
 router.get('/sharev2.js', function(req, res, next) {
     //记录分享日志
-    delete req.session.shareLog; //新的分享对象
     var _v = new Date().getTime();//用于sharelog 版本号
     var share_log = {_v:_v};
-    req.session.shareLog = {_v:_v};
-
+    req.session.shareLog = {_v:_v};//新的分享对象
+    console.log('forumshare 1',req.session.shareLog);
     var rs = {},
         type = req.query.type,
         id = req.query.id,
@@ -423,7 +422,8 @@ router.get('/sharev2.js', function(req, res, next) {
                     share_log.type = 2;
                     share_log.info = id;
                     //替换分享log内容
-                    if(req.session.shareLog._v === _v){
+                    if(!req.session.shareLog || !req.session.shareLog._v || _v >= req.session.shareLog._v){
+                        console.log('forumshare 2',share_log);
                         req.session.shareLog = share_log;
                     }
                     if(forumInfo.share_type && forumInfo.share_type == 1){
@@ -452,7 +452,8 @@ router.get('/sharev2.js', function(req, res, next) {
                     share_log.info = thread.info._id || thread.info;
                     share_log.thread_type = thread.pid?4:thread.type;
                     //替换分享log内容
-                    if(req.session.shareLog._v === _v){
+                    if(!req.session.shareLog || !req.session.shareLog._v || _v >= req.session.shareLog._v){
+                        console.log('forumshare 3',share_log);
                         req.session.shareLog = share_log;
                     }
                     //组装分享路径与判断分享类型

app/service/httpService.js

@@ -142,6 +142,7 @@ exports.createLog = function(req,source,info,type,thread_type,thread,p_thread) {
 };
 
 exports.createShareLog = function(req,share_type) {
+    console.log('forumshare 4',req.session.shareLog);
     var logObj = req.session.shareLog || {};
     logObj.source = req.session.mobileForumUser.source;
     logObj.mid = req.session.openUser.mid;