Merge commit '9f297526' into SANDBOX

app/controllers/mobile/forumShare.js

@@ -292,7 +292,9 @@ router.get('/sharev2.js', function(req, res, next) {
         mid = req.session.openUser.mid,
         link = '/app/forum/' + ent_code + '/v2?pageUrl=',
         share_log = {};
-    delete req.session.mobileForumUser.share_log;
+    // delete req.session.mobileForumUser.share_log;  //在接口分享中不再使用这个,因为在其它地方会把req.session.mobileForumUser重新赋值
+
+    delete req.session.shareLog; //新的分享对象
 
     var title = '',desc = '',imgUrl = '';
 
@@ -305,7 +307,7 @@ router.get('/sharev2.js', function(req, res, next) {
         share_log.type = 2;
         share_log.info = id;
         //替换分享log内容
-        req.session.mobileForumUser.share_log = share_log;
+        req.session.shareLog = share_log;
         
         forumInfoService.getInfoById(id, function(err, forumInfo) {
             if (err) {
@@ -338,10 +340,7 @@ 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内容
-                req.session.mobileForumUser.share_log = share_log;
-
-                console.log('req.session.mobileForumUser = ');
-                console.log(req.session.mobileForumUser);
+                req.session.shareLog = share_log;
 
 
                 //组装分享路径与判断分享类型
@@ -401,5 +400,4 @@ router.get('/sharev2.js', function(req, res, next) {
             res.json(_.assign({result:false},returnCode.WRONG_PARAM));
         });
     }
-    // req.session.mobileForumUser.share_log = share_log;
 });
\ No newline at end of file

app/service/httpService.js

@@ -22,7 +22,6 @@ var ForumPVLog = mongoose.model('ForumPVLog'),
     ForumShareLog = mongoose.model('ForumShareLog'),
     ForumThread = mongoose.model('ForumThread');
 exports.sendRequest = function(ent_code, mid, action, messageid, integral, exp) {
-    console.log('送积分了');
     var obj = {
         tag: 'member',
         key: 'forum',
@@ -143,7 +142,7 @@ exports.createLog = function(req,source,info,type,thread_type,thread,p_thread) {
 };
 
 exports.createShareLog = function(req,share_type) {
-    var logObj = req.session.mobileForumUser.share_log || {};
+    var logObj = req.session.shareLog || {};
     logObj.source = req.session.mobileForumUser.source;
     logObj.mid = req.session.openUser.mid;
     logObj.ent_code = req.session.user.ent_code;