Merge remote-tracking branch 'refs/remotes/origin/hotfix/11' into develop

# Conflicts:
#	config/common.js

@@ -360,11 +360,6 @@ if (isProduction) {
                     'http://service-test1.yohops.com:9999/') +
                 'payment/weixin_notify',
         },
-        monitorReport: {
-            host: '192.168.102.22',
-            port: 8086,
-            db: 'web_monitor',
-        },
         loggers: {
             infoFile: {
                 name: 'info',
@@ -397,5 +392,37 @@ if (isProduction) {
                 debugStdout: true,
             },
         },
+        zookeeperServer: 'zk.yohoops.com:2181',
+        monitorReport: {
+            // influxdb
+            host: 'influxdb.yohoops.com',
+            port: 8086,
+            db: 'web_monitor',
+        },
+        redis: {
+            connect: {
+                host: 'redis.yohoops.com',
+                port: '6379',
+                enable_offline_queue: false,
+                retry_strategy(options) {
+                    if (options.error && options.error.code === 'ECONNREFUSED') {
+                        console.log('connect redis server fail');
+                    }
+
+                    if (options.attempt < 10) {
+                        return Math.min(options.attempt * 100, 1000);
+                    } else if (options.attempt > 10 && options.attempt < 100) {
+                        return 1000;
+                    } else {
+                        return 1000 * 10;
+                    }
+                }
+            },
+            session: {
+                host: 'redis.yohoops.com',
+                port: '6379',
+                prefix: 'yohobuy_session:'
+            }
+        },
     });
 }