Merge remote-tracking branch 'origin/feature/zookeeper' into feature/zookeeper

@@ -41,7 +41,7 @@ global.utils = path.resolve('./utils');
 app.locals.devEnv = app.get('env') === 'development';
 app.locals.version = pkg.version;
 
-// zookeeper设置
+// zookeeper
 if (config.zookeeperServer) {
     require('yoho-zookeeper')(config.zookeeperServer, 'pc', app.locals.pc = {});
 }

@@ -73,7 +73,8 @@ module.exports = {
             appID: 'wx3ae21dcbb82ad672',
             appSecret: 'e78afb2321e6a19085767e1a0f0d52c1'
         }
-    }
+    },
+    zookeeperServer: '192.168.102.168:2188'
 };
 
 if (isProduction) {
@@ -99,7 +100,8 @@ if (isProduction) {
         interfaceShunt: {
             open: false,
             url: 'http://123.206.2.55/strategy'
-        }
+        },
+        zookeeperServer: '10.66.1.97:2181'
     });
 } else if (isTest) {
     Object.assign(module.exports, {

@@ -39,7 +39,7 @@
     "express": "^4.13.1",
     "express-handlebars": "^3.0.0",
     "express-session": "^1.13.0",
-      "handlebars": "^4.0.5",
+    "handlebars": "^4.0.5",
     "influxdb-winston": "^1.0.1",
     "lodash": "^4.13.1",
     "md5": "^2.1.0",
@@ -62,8 +62,8 @@
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
     "yoho-express-session": "^1.14.1",
-      "yoho-node-lib": "0.1.19",
-      "yoho-zookeeper": "^1.0.3"
+    "yoho-node-lib": "0.1.19",
+    "yoho-zookeeper": "^1.0.3"
   },
   "devDependencies": {
     "autoprefixer": "^6.3.6",