fix

@@ -11,6 +11,7 @@ const _ = require('lodash');
 const guangModel = require('../models/index');
 const headerModel = require('../../../doraemon/models/header');
 const ghelper = require('../models/guang-helper');
+const urlHelper = require('../models/url-helper');
 const querystring = require('querystring');
 const helpers = global.yoho.helpers;
 
@@ -58,7 +59,7 @@ exports.index = (req, res, next) => {
                 pageSize: pageSize,
                 type: type,
                 pathNav: pathNav,
-                baseUrl: helpers.urlFormat('/' + channel + `-t${type}`, null, 'guang'),
+                baseUrl: urlHelper.listUrl(channel, type),
                 page: page,
                 total: (ret[2] && ret[2].total) || 0
             },
@@ -169,7 +170,7 @@ exports.editor = (req, res, next) => {
                 exRecos: ret[4],
 
                 gender: gender,
-                baseUrl: helpers.urlFormat('/' + channel + `-author-i${authorId}`, null, 'guang'),
+                baseUrl: urlHelper.editorUrl(channel, authorId),
                 pageSize: pageSize,
                 pathNav: pathNav,
                 page: page,

@@ -38,7 +38,7 @@ exports.spager = function() {
         pageSizeVar = options.hash.pageSizeVar || 'pageSize';
 
     // 清除原来page(page=1&) 重新定义page
-    let clearPageReg = new RegExp(pageVar + '=[^&]*(&|$)'),
+    let clearPageReg = /\/$/,
         clearSizeReg = new RegExp(pageSizeVar + '=[^&]*(&|$)'),
         base = baseUrl.replace(clearPageReg, '');
 

@@ -8,7 +8,7 @@
 const _ = require('lodash');
 const moment = require('moment');
 const ghelper = require('./guang-helper');
-const urlHelper = require('./urlHelper');
+const urlHelper = require('./url-helper');
 
 const helpers = global.yoho.helpers;
 const serviceApi = global.yoho.ServiceAPI;

@@ -7,7 +7,7 @@
 const helpers = global.yoho.helpers;
 
 module.exports.editorUrl = function(channel, authorId) {
-    return helpers.urlFormat(`/${channel}-author-i${authorId}/`, null, 'guang');
+    return helpers.urlFormat(`/author-${channel}-${authorId}/`, null, 'guang');
 };
 
 module.exports.listUrl = function(channel, type) {

@@ -31,6 +31,19 @@ module.exports = [
         }
     },
 
+    // 老的首页 + 类型 + 翻页
+    {
+        type: TYPE.redirect,
+        origin: req => /index\/index/i.test(req.path),
+        target: (req) => {
+            return helpers.urlFormat(
+                `/${req.yoho.channel}-t${req.query.type || 0}${req.query.page ? '-p' + req.query.page : ''}/`,
+                null,
+                'guang'
+            );
+        }
+    },
+
     // 首页 + 类型
     {
         type: TYPE.rewrite,
@@ -62,39 +75,39 @@ module.exports = [
         },
         target: (req) => {
             let channel = req.yoho.channel;
-            let aid = req.query.author_id;
+            let authorId = req.query.author_id;
+            let page = req.query.page;
 
-            if (!aid) {
+            if (!authorId) {
                 return helpers.urlFormat(`/${channel}/`, null, 'guang');
             }
 
-            req.mobileUrl = `${MOBILE_DOMAIN}/author/${aid}/`;
-            return helpers.urlFormat(`/${channel}-author-i${aid}/`, null, 'guang');
+            return helpers.urlFormat(`/author-${channel}-${authorId}${page ? '-p' + page : ''}/`, null, 'guang');
         }
     },
 
     // 编缉首页
     {
         type: TYPE.rewrite,
-        origin: /^\/(boys|girls|kids|lifestyle)-author-i([\d]+)(\/*)$/,
-        target: (req, match, p1, p2) => {
-            req.query.channel = p1;
-            req.query.author_id = p2;
-            req.mobileUrl = `${MOBILE_DOMAIN}/author/${p2}/`;
-            return `/guang/index/editor?channel=${p1}&author_id=${p2}`;
+        origin: /^\/author-(boys|girls|kids|lifestyle)-([\d]+)(\/*)$/,
+        target: (req, match, channel, authorId) => {
+            req.query.channel = channel;
+            req.query.author_id = authorId;
+            req.mobileUrl = `${MOBILE_DOMAIN}/author-${channel}-${authorId}/`;
+            return `/guang/index/editor?channel=${channel}&author_id=${authorId}`;
         }
     },
 
     // 编缉首页 + 翻页
     {
         type: TYPE.rewrite,
-        origin: /^\/(boys|girls|kids|lifestyle)-author-i([\d]+)-p([\d]+)(\/*)$/,
-        target: (req, match, p1, p2, p3) => {
-            req.query.channel = p1;
-            req.query.author_id = p2;
-            req.query.page = p3;
-            req.mobileUrl = `${MOBILE_DOMAIN}/author/${p2}`;
-            return `/guang/index/editor?channel=${p1}&author_id=${p2}&page=${p3}`;
+        origin: /^\/author-(boys|girls|kids|lifestyle)-([\d]+)-p([\d]+)(\/*)$/,
+        target: (req, match, channel, authorId, page) => {
+            req.query.channel = channel;
+            req.query.author_id = authorId;
+            req.query.page = page;
+            req.mobileUrl = `${MOBILE_DOMAIN}/author-${channel}-${authorId}-p${page}/`;
+            return `/guang/index/editor?channel=${channel}&author_id=${authorId}&page=${page}`;
         }
     }