Merge branch 'feature/recList2.0' into 'master'

Feature/rec list2.0



See merge request !699

@@ -135,8 +135,8 @@ router.get('/seckill/get-product-list', seckill.getProductList); // 秒杀列表
 router.get('/search/index', search.index);
 router.get('/search/index', search.index);
 
 
 // 推广落地页
 // 推广落地页
-router.get('/search/keyword/:query', rewrite.sortParams, search.keyword);
-router.get('/search/chanpin/:id', rewrite.sortParams, search.keyId);
+router.get('/search/so/:query.html', rewrite.sortParams, search.keyword);
+router.get('/search/chanpin/:id.html', rewrite.sortParams, search.keyId);
 
 
 // 搜索落地页
 // 搜索落地页
 router.get('/search/list', rewrite.sortParams, search.list);
 router.get('/search/list', rewrite.sortParams, search.list);

@@ -104,7 +104,8 @@ const cachePage = {
     '/activity/shopNav': 30 * SECOND,
     '/activity/shopNav': 30 * SECOND,
 
 
     // 关键词页面
     // 关键词页面
-    '/product/search/keyword/:query': 7 * DAY
+    '/product/search/so/:query.html': 7 * DAY,
+    '/product/search/chanpin/:id.html': 7 * DAY
 
 
 };
 };
 
 

@@ -84,18 +84,8 @@ module.exports = () => {
                     }
                     }
                     break;
                     break;
             }
             }
-        } else {
-            let soReg = /\/so\/(.*).html/;
-            let chanpinReg = /\/chanpin\/(.*).html/;
-
-            if (soReg.test(req.path)) {
-                soReg.exec(req.url);
-                req.url = `/product/search/keyword/${RegExp.$1}`;
-            } else if (chanpinReg.test(req.path)) {
-                chanpinReg.exec(req.url);
-                req.url = `/product/search/chanpin/${RegExp.$1}`;
-            }
         }
         }
+
         next();
         next();
     };
     };
 };
 };

@@ -61,6 +61,11 @@ module.exports = () => {
             req.url = '/activity/couponSend';
             req.url = '/activity/couponSend';
         }
         }
 
 
+        if (/\/chanpin\/(.*).html/.test(req.url) || /\/so\/(.*).html/.test(req.url)) {
+            // 获取seo兼容
+            req.url = `/product/search${req.path}`;
+        }
+
         next();
         next();
     };
     };
 };
 };