Merge branch 'remould_1123_share'

app/controllers/mobile/forumShare.js

@@ -260,13 +260,22 @@ function getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,forumThre
         title = title?title.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title):'';
         desc = desc?desc.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.content):'';
     } 
+
     if(desc && desc.length > 30){
         desc = desc.substr(0,30);
     }else if(!desc){
         desc = '';
     }
+
+    var tempTitle = "";
+    if(!title){
+        tempTitle = desc;
+    }else{
+        tempTitle = title;
+    }
+
     res.json({
-        title:title,
+        title:tempTitle,
         desc:desc,
         link:link,
         imgUrl:imgUrl,
@@ -333,7 +342,7 @@ router.get('/sharev2.js', function(req, res, next) {
                     case 1://文章
                         link = link + 'detail';
                         share_type = 'article';
-                        title = thread.title == '发话题'?thread.info.name:thread.title;
+                        title = thread.title == '发话题'?"":thread.title;
                     break;
                     case 2://话题
                         if(thread.level === 2){
@@ -358,8 +367,15 @@ router.get('/sharev2.js', function(req, res, next) {
                         }
                     break;
                 }
-                desc = thread.content?thread.content.replace(/<\/?.+?>/g,"").replace(/&nbsp;/g,""):'';
+                desc = thread.content?thread.content.replace(/<\/?.+?>/g,"").replace(/&nbsp;/g,"").replace(/\t/g,"").replace(/\n/g,""):'';
+                
+                // 分享图标：帖子带图片则使用第一张图片，否则使用发帖者的头像
+                if(thread.images && thread.images[0]){
+                    imgUrl = thread.images[0].urlFileName;
+                }else{
                     imgUrl = thread.from.displayIcon || thread.from.icon || thread.info.icon;
+                }
+
                 link  += baseParamsUrl;
                 //获取分享设置
                 if (thread.share_type!==2) {

app/controllers/mobile/forumThread.js

@@ -58,7 +58,14 @@ function create(req, callback) {
         entity.images = array;
     }
     //-----------处理前端上传图片结束
-    if (entity.pid && entity.type == 3) {
+
+    //校验是否全是表情
+    var temp_content = entity.content;
+    temp_content = temp_content.replace(/<img\/?.+?border="0">/g,"");
+
+    if(!temp_content || temp_content.length < 1){
+        callback('content error', null);
+    } else if (entity.pid && entity.type == 3) {
         forumThreadService.getByConditions({
             type: 3,
             level: '2',
@@ -473,7 +480,7 @@ router.post('/thread/create', function(req, res, next) {
                             create(req, function(err, thread) {
                                 if (err) {
                                     console.error(err);
-                                    res.json(returnCode.BUSY);
+                                    res.json(_.assign(err, returnCode.BUSY));
                                 } else {
                                     forumAboutMEService.saveThread(thread);
                                     forumLimitOperationService.checkLimitOperationProhibitionAddIntegral(userId, function(err, flag) {