Merge branch 'hotfix/api'

@@ -7,11 +7,6 @@
 
 const config = require('./config/common');
 
-// use one apm
-if (config.useOneapm) {
-    require('oneapm');
-}
-
 const express = require('express');
 const path = require('path');
 const bodyParser = require('body-parser');

@@ -28,7 +28,6 @@ module.exports = {
         activity: '//activity.yohobuy.com',
         index: '//m.yohobuy.com'
     },
-    useOneapm: false,
     useCache: false,
     memcache: {
         master: ['192.168.102.205:12111'],
@@ -79,16 +78,15 @@ if (isProduction) {
         domains: {
             api: 'http://api.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
-            liveApi: 'http://preapi.live.yoho.cn/' // 'http://api.live.yoho.cn/'
+            liveApi: 'http://api.live.yoho.cn/'
         },
         memcache: {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
             session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
-            timeout: 1000,
+            timeout: 100,
             retries: 0
         },
-        useOneapm: true,
         useCache: true,
         interfaceShunt: {
             open: false,
@@ -99,18 +97,17 @@ if (isProduction) {
     Object.assign(module.exports, {
         appName: 'm.yohobuy.com for test',
         domains: {
-            api: 'http://api-test3.yohops.com:9999/',
-            service: 'http://service-test3.yohops.com:9999/',
-            liveApi: 'http://testapi.live.yohops.com:9999/'
+            api: process.end.TEST_API || 'http://api-test1.yohops.com:9999/',
+            service: process.end.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
+            liveApi: process.end.TEST_LIVE || 'http://testapi.live.yohops.com:9999/'
         },
         memcache: {
             master: ['127.0.0.1:12111'],
             slave: ['127.0.0.1:12112'],
             session: ['127.0.0.1:12111'],
-            timeout: 1000,
+            timeout: 100,
             retries: 0
         },
-        useOneapm: true,
         useCache: true
     });
 }

@@ -44,7 +44,6 @@
     "memcached": "^2.2.1",
     "moment": "^2.14.1",
     "morgan": "^1.7.0",
-    "oneapm": "^1.2.20",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-qq": "0.0.3",

-#!/bin/bash
-lsbom -f -l -s -pf /var/db/receipts/org.nodejs.pkg.bom \
-| while read i; do
-  sudo rm /usr/local/${i}
-done
-sudo rm -rf /usr/local/lib/node \
-     /usr/local/lib/node_modules \
-     /var/db/receipts/org.nodejs.*
-      
\ No newline at end of file