Merge remote-tracking branch 'origin/feature/sitemapPage' into release/6.0.1

@@ -7,7 +7,7 @@ const sm = require('sitemap');
 const staticUrls = require('../../../config/staticUrls');
 const api = global.yoho.API;
 const Service = global.yoho.ServiceAPI;
-const redis = global.yoho.redis;
+const redis = require('../../../doraemon/middleware/redis');
 
 const getStaticUrls = (currentStatics) => {
     let urls = [];

@@ -46,6 +46,6 @@ router.get('/limitcodeColSize', help.limitcodeColSize);// 选择限购码颜色
 router.get('/limitcodeIntro', help.limitcodeIntro);// 什么是限购码 (APP使用)
 
 // 站点地图
-router.get(/^\/sitemap(.*)\.xml/, sitemap.siteMap);
+router.get(/^\/sitemap(\d*)\.xml/, sitemap.siteMap);
 
 module.exports = router;

@@ -51,7 +51,7 @@ module.exports = () => {
             req.url = '/service/systemUpdate';
         }
 
-        if (/^\/sitemap(\d+)\.xml/.test(req.url)) {
+        if (/^\/sitemap(\d*)\.xml/.test(req.url)) {
             // sitemap/sitemap.xml
             req.url = `/service${req.url}`;
         }

@@ -4,6 +4,7 @@ const redis = require('redis');
 const bluebird = require('bluebird');
 const config = require('../config/common');
 let client;
+const timeout = 200; // redis 操作超时时间
 
 try {
     client = redis.createClient(config.redis.connect);
@@ -20,7 +21,9 @@ try {
             }
         }
 
-        return client.multi.call(client, args).execAsync();
+        return client.multi.call(client, args).execAsync().timeout(timeout).catch(()=>{
+            return false;
+        });
     };
 
     client.on('error', function() {