'news详情分词'

郝肖肖
Commit 5d1c5a4f5f5496ccaa796655d550d81010bbd627 1 parent 35fc9488
Showing 8 changed files with 73 additions and 21 deletions
apps/news/controllers/index.js
apps/news/models/news-service.js
apps/news/models/utils.js
apps/news/views/action/news-detail.hbs
apps/news/views/partial/news-index/tvls.hbs
dispatch.js
public/js/news/news-index/view.js
public/scss/news/_detail.css
--- a/apps/news/controllers/index.js
View file @5d1c5a4
+++ b/apps/news/controllers/index.js
View file @5d1c5a4
@@ -19,9 +19,9 @@ exports.index = (req, res, next) => {
         }
         return res.render('news-index', Object.assign({
-            title: '新闻 | ' + (res.locals.title || ''),
+            title: '潮流资讯 | ' + (res.locals.title || ''),
             pageHeader: headerModel.setNav({
-                navTitle: '新闻'
+                navTitle: '潮流资讯'
             }),
             module: 'news',
             localCss: true,
@@ -51,7 +51,7 @@ exports.detail = (req, res, next) => {
     req.ctx(newsService).detail(channel, query).then(result => {
         return res.render('news-detail', Object.assign({
             pageHeader: headerModel.setNav({
-                navTitle: result.header && result.header.title || '新闻详情页'
+                navTitle: result.header && result.header.title || '潮流资讯详情页'
             }),
             module: 'news',
             localCss: true,
--- a/apps/news/models/news-service.js
View file @5d1c5a4
+++ b/apps/news/models/news-service.js
View file @5d1c5a4
@@ -2,8 +2,10 @@
 const _ = require('lodash');
 const helpers = global.yoho.helpers;
+const utils = '../../../utils';
+const redis = require(`${utils}/redis`);
 const NewsAPi = require('./news-api');
-const utils = require('./utils');
+const newsUtils = require('./utils');
 const moment = require('moment');
 const ATYPE = 'yohobuy4008899646,yohogroup,YOHO_GIRL,mars-app';
@@ -24,7 +26,7 @@ module.exports = class extends global.yoho.BaseModel {
             lresult = {
                 id: articleData.id,
-                url: helpers.urlFormat(`/news/${articleData.id}_${articleData.cid}.html`),
+                url: helpers.urlFormat(`/guang/news/${articleData.id}_${articleData.cid}.html`),
                 img: helpers.image(articleData.image, width, height, 1),
                 title: articleData.title,
                 publishTime: articleData.update_time && moment(articleData.update_time * 1000).format('MM月DD HH:mm'),
@@ -80,15 +82,18 @@ module.exports = class extends global.yoho.BaseModel {
             title: contents.title,
             summary: contents.summary,
             tag: contents.tag,
+            syncTypeName: contents.syncTypeName || 'YOHO潮流志',
             publishTime: contents.update_time && moment(contents.update_time * 1000).format('MM月DD HH:mm'),
         };
-        let content = utils.filterPhtml(contents.content, [
+        let content = newsUtils.filterPhtml(contents.content.replace(/www.yohobuy.com/ig, 'm.yohobuy.com'), [
             '阅读原文',
             '点击这里',
             '点这里'
         ]);
-        return {header: header, content: utils.filterAhtml(content)};
+        content = newsUtils.filterAhtml(content);
+
+        return {header: header, content: newsUtils.imgAlt(content, contents.title, 5)};
     }
     detail(channel, param) {
@@ -96,16 +101,25 @@ module.exports = class extends global.yoho.BaseModel {
             id: param.id,
             cid: param.cid
         };
-        let newsAPi = new NewsAPi(this.ctx);
-        return newsAPi.getContentDetail(params).then(result => {
+        return redis.all([
+            ['get', `global:yoho:news:detail:${params.id}-${params.cid}`]
+        ]).then(redisData => {
+            redisData = JSON.parse(redisData[0] || '{}');
+
+            if (!redisData.data) {
+                return new NewsAPi(this.ctx).getContentDetail(params);
+            }
+
+            return redisData;
+        }).then(result => {
             let responseData = {};
             // 详情页数据
             Object.assign(responseData, this._formatDetail(result, params));
             // seo
-            let title = _.get(responseData, 'header.title', '新闻详情页');
+            let title = _.get(responseData, 'header.title', '潮流资讯详情页');
             let keywords = [];
             let tags = _.compact(_.get(responseData, 'header.tag', []).map(el => {
                 return el.tag_name;
--- a/apps/news/models/utils.js
View file @5d1c5a4
+++ b/apps/news/models/utils.js
View file @5d1c5a4
@@ -23,7 +23,10 @@ const util = {
         });
-        return $.html();
+        html = $.html();
+        $ = '';
+
+        return html;
     },
     // 过滤 a标签连接和删除html标签中的script和link脚本
@@ -34,9 +37,33 @@ const util = {
         let $ = cheerio.load(html, {decodeEntities: false});
-        $('a').attr('href', 'javascript:void(0);').css({cursor: 'text'});// eslint-disable-line
+        $('a').removeAttr('style').removeAttr('target').not('.a-anchor').attr('href', 'javascript:void(0);').css({cursor: 'text'});// eslint-disable-line
         $('script,link').remove();
-        return $.html();
+
+        html = $.html();
+        $ = '';
+
+        return html;
+    },
+
+    // 过滤 a标签连接和删除html标签中的script和link脚本
+    imgAlt: (html, alt, num) => {
+        if (!html) {
+            return html;
+        }
+
+        let $ = cheerio.load(html, {decodeEntities: false});
+
+        _.each($('img').slice(0, num), item => {
+            let $dom = $(item);
+
+            $dom.attr('alt', $dom.attr('alt') || alt);
+        });
+
+        html = $.html();
+        $ = '';
+
+        return html;
     }
 };
--- a/apps/news/views/action/news-detail.hbs
View file @5d1c5a4
+++ b/apps/news/views/action/news-detail.hbs
View file @5d1c5a4
@@ -2,7 +2,7 @@
     <div class="detail" data-id="{{id}}">
         {{# header}}
             <div class="post-title">
-                <p class="title">{{title}}</p>
+                <h1 class="title">{{title}}</h1>
                 {{> news-index/tvls}}
             </div>
         {{/header}}
--- a/apps/news/views/partial/news-index/tvls.hbs
View file @5d1c5a4
+++ b/apps/news/views/partial/news-index/tvls.hbs
View file @5d1c5a4
 <div class="time-view-like-share clearfix">
-    <i class="iconfont">&#xe603;</i>
-    {{publishTime}}&nbsp;&nbsp;&nbsp;&nbsp;
-    {{#if pageView}}
-        <i class="iconfont">&#xe602;</i>
-        <span class="page-view">{{pageView}}</span>
+    {{#if syncTypeName}}
+        <span class="page-view">来源于微信公众号：{{syncTypeName}}</span>
     {{/if}}
     <div class="like-share-container">
+        <i class="iconfont">&#xe603;</i>
+        {{publishTime}}&nbsp;&nbsp;&nbsp;&nbsp;
+        {{#if pageView}}
+            <i class="iconfont">&#xe602;</i>
+            <span class="page-view">{{pageView}}</span>
+        {{/if}}
         {{#like}}
             <i class="iconfont like-btn{{#isLiked}} like{{/isLiked}}">&#xe601;</i>
             <span class="like-count">{{count}}</span>
--- a/dispatch.js
View file @5d1c5a4
+++ b/dispatch.js
View file @5d1c5a4
@@ -15,8 +15,8 @@ module.exports = app => {
     // 业务模块
     app.use('/product', require('./apps/product'));
+    app.use('/guang/news', require('./apps/news'));// seo-潮流资讯页
     app.use('/guang', require('./apps/guang'));
-    app.use('/news', require('./apps/news'));
     app.use('/activity', require('./apps/activity'));
     app.use('/cart', require('./apps/cart'));
--- a/public/js/news/news-index/view.js
View file @5d1c5a4
+++ b/public/js/news/news-index/view.js
View file @5d1c5a4
@@ -62,7 +62,7 @@ export class IndexView extends View {
         this.indexModel.loadMoreAjax({
             type: 'GET',
-            url: '/news/index/page',
+            url: '/guang/news/index/page',
             dataType: 'html',
             data: that.navState[index]
         }).then(rdata => {
--- a/public/scss/news/_detail.css
View file @5d1c5a4
+++ b/public/scss/news/_detail.css
View file @5d1c5a4
@@ -87,6 +87,9 @@ $focus-size: 42px;
         img {
             height: auto;
+            width: auto;
+            max-width: 100%;
+            color: #fff;
         }
     }
@@ -877,6 +880,11 @@ $focus-size: 42px;
             overflow: visible;
         }
     }
+
+    .a-anchor {
+        color: #93b4c5;
+        text-decoration: underline;
+    }
 }
 .news-detail-page.menu-open {