fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit 643ae93a0ad198890d0a0488e56c47d303d8b535 2 parents 83f952a8 bebf784b

Merge remote-tracking branch 'origin/feature/storeHome' into release/6.1

Inline Side-by-side
Showing 3 changed files with 14 additions and 8 deletions
... ... @@ -16,7 +16,8 @@ class storeHome extends global.yoho.BaseModel {
},
param: {
code: 200
}
},
api: global.yoho.ExtStoreAPI
};
return this.get(options).then(result => {
... ... @@ -77,7 +78,8 @@ class storeHome extends global.yoho.BaseModel {
},
param: {
code: 200
}
},
api: global.yoho.ExtStoreAPI
};
return this.get(options).then(result => {
... ... @@ -113,7 +115,8 @@ class storeHome extends global.yoho.BaseModel {
},
param: {
code: 200
}
},
api: global.yoho.ExtStoreAPI
};
return this.get(options).then(result => {
... ...
... ... @@ -17,8 +17,9 @@ const domains = {
singleApi: 'http://api-test3.yohops.com:9999/',
imSocket: 'ws://socket.yohobuy.com:10240',
imCs: 'http://im.yohobuy.com/api',
global: 'http://api-global.yohobuy.com',
store: 'http://192.168.102.47:8080/portal-gateway/'
platformApi: 'http://192.168.102.48:8088/',
store: 'http://192.168.102.47:8080/portal-gateway/wechat/',
extstore: 'http://extstore-test1.yohops.com'
};
module.exports = {
... ... @@ -137,7 +138,8 @@ if (isProduction) {
singleApi: 'http://single.yoho.cn/',
imSocket: 'wss://imsocket.yohobuy.com:443',
imCs: 'https://imhttp.yohobuy.com/api',
platformApi: 'http://api.platform.yohoops.org'
platformApi: 'http://api.platform.yohoops.org',
extstore: 'http://extstore.yohobuy.com'
},
memcache: {
master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
... ... @@ -207,7 +209,8 @@ if (isProduction) {
singleApi: process.env.TEST_SINGLE || 'http://api-test1.yohops.com:9999/',
imSocket: process.env.TEST_IM_SOCKET || 'ws://socket.yohobuy.com:10240',
imCs: process.env.TEST_IM_CS || 'http://im.yohobuy.com/api',
platformApi: 'http://192.168.102.48:8088/'
platformApi: 'http://192.168.102.48:8088/',
extstore: 'http://extstore-test1.yohops.com'
},
memcache: {
master: ['127.0.0.1:12111'],
... ...
... ... @@ -73,7 +73,7 @@
"xml2js": "^0.4.19",
"yoho-express-session": "^2.0.0",
"yoho-md5": "^2.0.0",
"yoho-node-lib": "=0.3.5",
"yoho-node-lib": "=0.3.6",
"yoho-zookeeper": "^1.0.8"
},
"devDependencies": {
... ...