Merge branch 'gray'

@@ -218,12 +218,19 @@ const getHeaderNavAsync = () => {
  * @param {String} 频道类型
  * @param {String} 频道类型
  * @return {promise}
  * @return {promise}
  */
  */
-let cacheHeaderHtml = {};
+const cacheHeaderHtml = {
+    boys: [],
+    girls: [],
+    kids: [],
+    lifestyle: []
+};
+
+const THIRTY_MINUTES = 1000 * 60 * 10;
 
 
 async function requestHeaderData(type) {
 async function requestHeaderData(type) {
     let resData = {};
     let resData = {};
 
 
-    if (_.isEmpty(cacheHeaderHtml[type])) {
+    if (_.isEmpty(cacheHeaderHtml[type][0]) || ((new Date() - cacheHeaderHtml[type][1]) > THIRTY_MINUTES)) {
         let channelNum = (function() {
         let channelNum = (function() {
             switch (type) {
             switch (type) {
                 case 'boys':
                 case 'boys':
@@ -270,17 +277,12 @@ async function requestHeaderData(type) {
             cacheHeaderHtml[type] = resData;
             cacheHeaderHtml[type] = resData;
         }
         }
     } else {
     } else {
-        resData = cacheHeaderHtml[type];
+        resData = cacheHeaderHtml[type][0];
     }
     }
 
 
     return Promise.resolve({headerData: resData});
     return Promise.resolve({headerData: resData});
 }
 }
 
 
-
-setInterval(function() {
-    cacheHeaderHtml = {};
-}, 60 * 10 * 1000);
-
 module.exports = {
 module.exports = {
     requestHeaderData
     requestHeaderData
 };
 };