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

@@ -30,7 +30,7 @@ let _getBannerData = () => {
         code: 200,
         code: 200,
         cache: true
         cache: true
     }).then((result) => {
     }).then((result) => {
-        return result.data ? resourcesProcess(result.data) : [];
+        return result && result.data ? resourcesProcess(result.data) : [];
     });
     });
 };
 };
 
 

@@ -117,7 +117,7 @@ if (isProduction) {
         domains: {
         domains: {
             api: 'http://testapi.yoho.cn:28078/',
             api: 'http://testapi.yoho.cn:28078/',
             service: 'http://testservice.yoho.cn:28077/',
             service: 'http://testservice.yoho.cn:28077/',
-            liveApi: 'http://api.live.yoho.cn/'
+            liveApi: 'http://testapi.live.yohops.com:9999/'
         },
         },
         memcache: {
         memcache: {
             master: ['127.0.0.1:12111'],
             master: ['127.0.0.1:12111'],

@@ -5,6 +5,8 @@
             "script": "app.js",
             "script": "app.js",
             "instances": "max",
             "instances": "max",
             "exec_mode": "cluster",
             "exec_mode": "cluster",
+            "merge_logs": true,
+            "log_date_format": "YYYY-MM-DD HH:mm Z",
             "env": {
             "env": {
                 "PORT": 6001
                 "PORT": 6001
             }
             }