Merge branch 'feature/webapm' into 'release/0606'

Feature/webapm



See merge request !303

@@ -152,7 +152,7 @@ module.exports = {
     apiCache: {
     apiCache: {
         cache: true
         cache: true
     },
     },
-    zookeeperServer: '192.168.102.168:2188',
+    zookeeperServer: '127.0.0.1:2181',
     redis: {
     redis: {
         connect: {
         connect: {
             host: '127.0.0.1',
             host: '127.0.0.1',

@@ -79,7 +79,8 @@ exports.serverError = () => {
                     udid,
                     udid,
                     code: err.code || 500,
                     code: err.code || 500,
                     path: `[${req.method}]${routeEncode.getRouter(req)}`,
                     path: `[${req.method}]${routeEncode.getRouter(req)}`,
-                    url: encodeURIComponent(req.originalUrl)
+                    url: encodeURIComponent(req.originalUrl),
+                    ip: _.get(req, 'yoho.clientIp', '')
                 },
                 },
                 fields: {
                 fields: {
                     message: err.message,
                     message: err.message,

@@ -58,7 +58,7 @@
     "uuid": "^2.0.2",
     "uuid": "^2.0.2",
     "yo-cli": "=1.0.7",
     "yo-cli": "=1.0.7",
     "yoho-express-session": "^2.0.0",
     "yoho-express-session": "^2.0.0",
-    "yoho-node-lib": "=0.6.14",
+    "yoho-node-lib": "=0.6.15",
     "yoho-zookeeper": "^1.0.8"
     "yoho-zookeeper": "^1.0.8"
   },
   },
   "devDependencies": {
   "devDependencies": {