fe / yohobuywap-node · Commits

Go to a project

Authored by 陈轩
Commit c709d6d0902f2f13c0bbc51a15b76d310c851620 1 parent d8f11f13

merge

Inline Side-by-side
Showing 1 changed file with 0 additions and 6 deletions
@@ -102,15 +102,9 @@ if (isProduction) { @@ -102,15 +102,9 @@ if (isProduction) {
102 appName: 'm.yohobuy.com for test', 102 appName: 'm.yohobuy.com for test',
103 assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets/', 103 assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets/',
104 domains: { 104 domains: {
105 -<<<<<<< HEAD  
106 - api: 'http://api-test3.yohops.com:9999/',  
107 - service: 'http://service-test3.yohops.com:9999/',  
108 - liveApi: 'http://testapi.live.yohops.com:9999/'  
109 -=======  
110 api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/', 105 api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
111 service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/', 106 service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
112 liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/' 107 liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/'
113 ->>>>>>> origin/master  
114 }, 108 },
115 memcache: { 109 memcache: {
116 master: ['127.0.0.1:12111'], 110 master: ['127.0.0.1:12111'],