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

app/controllers/mobile/forumShare.js

@@ -102,38 +102,42 @@ 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;
-			}
-            //默认分享设置 //查询板块默认分享设置
-            forumShareConfigService.getByKey(ent_code, 'share', function(err, result) {
-                if(err){
-                    console.error(err);
-                    res.json(_.assign({result:false},returnCode.BUSY));
-                }else{
-                    var title = '',desc = '',imgUrl = '';
-                    if (result) {
-                        //匹配板块默认分享设置
-                        result = result.meta_value;
-                        _.forEach(result,function(e){
-                            if (e.type === 'info') {
-                                title = e.title;
-                                desc = e.desc;
-                                imgUrl = e.imgUrl;
-                                return;
-                            }
-                        });
-                        link = link + 'index&infoId='+ id+'&uId='+uId;
-                        getWX(res, title, desc, link, imgUrl, mid,ent_code, id,type,null);
+			}else{
+                 //默认分享设置 //查询板块默认分享设置
+                forumShareConfigService.getByKey(ent_code, 'share', function(err, result) {
+                    if(err){
+                        console.error(err);
+                        res.json(_.assign({result:false},returnCode.BUSY));
                     }else{
-                        //没找到板块默认分享设置
-                        console.error('info默认分享设置不存在');
-                        res.json(_.assign({result:false},returnCode.DATA_NOTEXITS));
+                        var title = '',desc = '',imgUrl = '';
+                        if (result) {
+                            //匹配板块默认分享设置
+                            result = result.meta_value;
+                            _.forEach(result,function(e){
+                                if (e.type === 'info') {
+                                    title = e.title;
+                                    desc = e.desc;
+                                    imgUrl = e.imgUrl;
+                                    return;
+                                }
+                            });
+                            link = link + 'index&infoId='+ id+'&uId='+uId;
+                            getWX(res, title, desc, link, imgUrl, mid,ent_code, id,type,null);
+                        }else{
+                            //没找到板块默认分享设置
+                            console.error('info默认分享设置不存在');
+                            res.json(_.assign({result:false},returnCode.DATA_NOTEXITS));
+                        }
                     }
-                }
-            });
+                });
+            }
+           
         });
         
     }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 {