|
...
|
...
|
@@ -102,15 +102,9 @@ if (isProduction) { |
|
|
|
appName: 'm.yohobuy.com for test',
|
|
|
|
assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets/',
|
|
|
|
domains: {
|
|
|
|
<<<<<<< HEAD
|
|
|
|
api: 'http://api-test3.yohops.com:9999/',
|
|
|
|
service: 'http://service-test3.yohops.com:9999/',
|
|
|
|
liveApi: 'http://testapi.live.yohops.com:9999/'
|
|
|
|
=======
|
|
|
|
api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
|
|
|
|
service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
|
|
|
|
liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/'
|
|
|
|
>>>>>>> origin/master
|
|
|
|
},
|
|
|
|
memcache: {
|
|
|
|
master: ['127.0.0.1:12111'],
|
...
|
...
|
|
