Merge branch 'gray' into 'master'

Gray



See merge request !272

@@ -313,21 +313,21 @@ module.exports = class extends global.yoho.BaseModel {
                     income = userInfo.income || 0;
                 }
 
-                genderArr = configData.gender;
+                genderArr = _.cloneDeep(configData.gender);
                 for (let value of genderArr) {
                     if (value.value === parseInt(gender, 0)) {
                         value.isChecked = true;
                     }
                 }
 
-                professionArr = configData.profession;
+                professionArr = _.cloneDeep(configData.profession);
                 for (let value of professionArr) {
                     if (value.value === parseInt(profession, 0)) {
                         value.isChecked = true;
                     }
                 }
 
-                incomeArr = configData.income;
+                incomeArr = _.cloneDeep(configData.income);
                 for (let value of incomeArr) {
                     if (value.value === parseInt(income, 0)) {
                         value.isChecked = true;
@@ -496,7 +496,7 @@ module.exports = class extends global.yoho.BaseModel {
                     shoppingHabitArr,
                     dressArr = [];
 
-                shoppingHabitArr = configData.shoppingHabits;
+                shoppingHabitArr = _.cloneDeep(configData.shoppingHabits);
                 if (habitsInfo.shopping) {
                     for (let value of shoppingHabitArr) {
                         if (value.value === parseInt(habitsInfo.shopping, 0)) {
@@ -505,7 +505,7 @@ module.exports = class extends global.yoho.BaseModel {
                     }
                 }
 
-                dressHabitArr = configData.dressHabits;
+                dressHabitArr = _.cloneDeep(configData.dressHabits);
                 if (habitsInfo.dress) {
                     dressArr = habitsInfo.dress.split(',');
                     for (let value of dressHabitArr) {

@@ -10,7 +10,7 @@ const helpers = global.yoho.helpers;
 const logger = global.yoho.logger;
 const _ = require('lodash');
 
-// const handleFilterUrl = require(`${global.utils}/parameter`).fullParamToMinPath;
+const handleFilterUrl = require(`${global.utils}/parameter`).fullParamToMinPath;
 
 // 搜索相关接口
 const searchApi = require('../models/search-api');
@@ -26,14 +26,14 @@ exports.index = (req, res, next) => {
     let resData = {};
     let qs = '';
 
-    // if (req.originalUrl && req.originalUrl.indexOf('.html') < 0 &&
-    //     req.originalUrl.indexOf('?') < 0 && !_.isEmpty(req.query)) {
-    //     let rUrl = handleFilterUrl('/list', req.query);
+    if (req.originalUrl &&
+        req.originalUrl.indexOf('.html') < 0 &&
+        req.originalUrl.indexOf('?') < 0 &&
+        req.yoho.seoParse) {
+        let rUrl = handleFilterUrl('/list', req.query);
 
-    //     if (rUrl !== req.originalUrl) {
-    //         return res.redirect(301, helpers.urlFormat(rUrl));
-    //     }
-    // }
+        return res.redirect(301, helpers.urlFormat(rUrl));
+    }
 
     try {
         qs = decodeURIComponent(req._parsedOriginalUrl.query || '');

@@ -8,7 +8,12 @@ module.exports = (req, res, next) => {
     param = _.trimEnd(param, '.html');
 
     if (param) {
-        Object.assign(req.query, parameter.minPathToFullParam(param));
+        const params = parameter.minPathToFullParam(param);
+
+        if (Object.keys(params).length) {
+            Object.assign(req.query, params);
+            req.yoho.seoParse = true;
+        }
     }
 
     next();

@@ -58,7 +58,7 @@
     "urlencode": "^1.1.0",
     "uuid": "^2.0.2",
     "yoho-express-session": "^2.0.0",
-    "yoho-node-lib": "=0.6.10",
+    "yoho-node-lib": "=0.6.11",
     "yoho-zookeeper": "^1.0.8"
   },
   "devDependencies": {

@@ -8668,9 +8668,9 @@ yoho-jquery@^1.12.4:
   version "1.12.4"
   resolved "http://npm.yohops.com/yoho-jquery/-/yoho-jquery-1.12.4.tgz#22499b325f293ee8b1d60559777348156494926d"
 
-yoho-node-lib@=0.6.10:
-  version "0.6.10"
-  resolved "http://npm.yohops.com/yoho-node-lib/-/yoho-node-lib-0.6.10.tgz#2e697465e1bbe8197f55c68717a0ffd3b9308687"
+yoho-node-lib@=0.6.11:
+  version "0.6.11"
+  resolved "http://npm.yohops.com/yoho-node-lib/-/yoho-node-lib-0.6.11.tgz#24c45c61af7f7c27d91b5fd0a6d23a1976d6de5d"
   dependencies:
     dnscache "^1.0.1"
     handlebars "^4.0.5"