Merge branch 'feature/docker' of git.yoho.cn:fe/yohobuywap-node into feature/docker

@@ -33,10 +33,9 @@ const index = (req, res, next) => {
         });
         });
 
 
         _.forEach(result, item => {
         _.forEach(result, item => {
-            item.url = item.url.indexOf('http') >= 0 ? item.url : 'http://' + item.url;
             feed.addItem({
             feed.addItem({
                 title: item.title,
                 title: item.title,
-                link: `${item.url}&ref=rss`,
+                link: `https://m.yohobuy.com/guang/${item.id}.html?ref=rss`,
                 description: item.intro,
                 description: item.intro,
                 author: [{
                 author: [{
                     name: (item.author && item.author.name) || ' '
                     name: (item.author && item.author.name) || ' '
@@ -60,7 +59,7 @@ const rss = (req, res, next, gmt) => {
             return next();
             return next();
         }
         }
         _.forEach(result, item => {
         _.forEach(result, item => {
-            item.url = item.url.indexOf('http') >= 0 ? item.url : 'http://' + item.url;
+            item.url = `https://m.yohobuy.com/guang/${item.id}.html?ref=rss`;
             let time = new Date(item.publishTimeLong &&
             let time = new Date(item.publishTimeLong &&
                 parseFloat(item.publishTimeLong) || moment(item.publishTime, 'MM月DD日 HH:mm'));
                 parseFloat(item.publishTimeLong) || moment(item.publishTime, 'MM月DD日 HH:mm'));
             let format = gmt ? 'ddd, MM MMM YYYY hh:mm:ss +0800' : 'YYYY-MM-DD hh:mm:ss +0800';
             let format = gmt ? 'ddd, MM MMM YYYY hh:mm:ss +0800' : 'YYYY-MM-DD hh:mm:ss +0800';

@@ -33,16 +33,16 @@ class RssModel extends global.yoho.BaseModel {
                     if (value.text) { // 文字
                     if (value.text) { // 文字
                         result += htmlProcess.removeHtml(htmlProcess.escapeToHtml(value.text.data.text)) + '<br/>';
                         result += htmlProcess.removeHtml(htmlProcess.escapeToHtml(value.text.data.text)) + '<br/>';
                     } else if (value.singleImage) { // 单张图
                     } else if (value.singleImage) { // 单张图
-                        result += `<img src="${helpers.image(value.singleImage.data[0].src, 640, 640)}"/><br/>`;
+                        result += `<img src="https:${helpers.image(value.singleImage.data[0].src, 640, 640)}"/><br/>`;
                     } else if (value.smallPic && value.smallPic.data) { // 多张小图
                     } else if (value.smallPic && value.smallPic.data) { // 多张小图
                         value.smallPic.data.forEach((small) => {
                         value.smallPic.data.forEach((small) => {
-                            result += `<img src="${helpers.image(small.src, 315, 420)}"/>`;
+                            result += `<img src="https:${helpers.image(small.src, 315, 420)}"/>`;
                         });
                         });
                         result += '<br/>';
                         result += '<br/>';
                     }
                     }
                 });
                 });
 
 
-                result += `<a href="http://guang.m.yohobuy.com/info/index?id=${id}">查看原文</a>`;
+                result += `<a href="https://m.yohobuy.com/guang/${id}.html?ref=rss">查看原文</a>`;
                 return result;
                 return result;
             }
             }
         });
         });

 <?xml version='1.0' encoding='utf-8'?>
 <?xml version='1.0' encoding='utf-8'?>
 <rss version='2.0'>
 <rss version='2.0'>
   <channel>
   <channel>
-    <language>zh-cn</language> 
+    <language>zh-cn</language>
     <title><![CDATA[有货逛]]></title>
     <title><![CDATA[有货逛]]></title>
     <link><![CDATA[http://yohobuy.com]]></link>
     <link><![CDATA[http://yohobuy.com]]></link>
     <description><![CDATA[Yoho!Buy有货 | 年轻人潮流购物中心]]></description>
     <description><![CDATA[Yoho!Buy有货 | 年轻人潮流购物中心]]></description>
@@ -17,13 +17,13 @@
     {{# items}}
     {{# items}}
   	    <item>
   	    <item>
   	      <title><![CDATA[{{title}}]]></title>
   	      <title><![CDATA[{{title}}]]></title>
-  	      <link><![CDATA[{{{url}}}&ref=rss]]></link>
+  	      <link><![CDATA[{{{url}}}]]></link>
   	      <description><![CDATA[{{{intro}}}]]></description>
   	      <description><![CDATA[{{{intro}}}]]></description>
   	      <pubDate><![CDATA[{{publishTime}}]]></pubDate>
   	      <pubDate><![CDATA[{{publishTime}}]]></pubDate>
   	      <source><![CDATA[有货逛]]></source>
   	      <source><![CDATA[有货逛]]></source>
   	      <author>有货</author>
   	      <author>有货</author>
   	    </item>
   	    </item>
   	{{/items}}
   	{{/items}}
-    
+
     </channel>
     </channel>
-</rss>
+</rss>