Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development

app/controllers/mobile/forumShare.js

@@ -102,11 +102,13 @@ router.get('/:ent_code/share.js', function(req, res, next) {
             }
             if(forumInfo.share_type == 1){
                 var shareInfo = forumInfo.share || {};
-                var title = shareInfo.title || '',desc = shareInfo.desc || '',imgUrl = shareInfo.imgUrl || '';
+                var title = shareInfo.title || '',
+                    desc = shareInfo.description || '',
+                    imgUrl = shareInfo.icon || '';
                 link = link + 'index&infoId='+ id+'&uId='+uId;
                 getWX(res, title, desc, link, imgUrl, mid,ent_code, id,type,null);
                 return;
-			}
+			}else{
                  //默认分享设置 //查询板块默认分享设置
                 forumShareConfigService.getByKey(ent_code, 'share', function(err, result) {
                     if(err){
@@ -134,6 +136,8 @@ router.get('/:ent_code/share.js', function(req, res, next) {
                         }
                     }
                 });
+            }
+           
         });
         
     }else if (type === 'Thread') {

app/service/httpService.js

@@ -65,7 +65,7 @@ var sendThreadLogRequest = function(open_id, user_agent, origin_ip, method, nick
 var getClientIP = function(req) {
     var ipAddress;
     var headers = req.headers;
-    var forwardedIpsStr = headers['x-real-ip'] || headers['x-forwarded-for'];
+    var forwardedIpsStr = headers['remoteip'] ||  headers['x-real-ip'] || headers['x-forwarded-for'];
     if (forwardedIpsStr) {
         ipAddress = forwardedIpsStr;
     } else {