fe / yohobuy-node · Commits

Go to a project

Authored by 陈峰
Commit 63a25f54f28feec867031f654097c33bffb75b5e 2 parents aa2af9d3 8c720721

Merge branch 'release/6.4.1' into 'gray' 

Release/6.4.1



See merge request !217
Inline Side-by-side
Showing 2 changed files with 6 additions and 8 deletions
... ... @@ -24,8 +24,7 @@ module.exports = class extends global.yoho.BaseModel {
type: 'shop',
method: 'app.favorite.queryFavoriteCountByShopIds'
},
url: '/favorite',
api: global.yoho.SingleAPI
url: '/favorite'
});
}
... ... @@ -36,8 +35,7 @@ module.exports = class extends global.yoho.BaseModel {
type: 'brand',
method: 'app.favorite.queryFavoriteCountByBrandId'
},
url: '/favorite',
api: global.yoho.SingleAPI
url: '/favorite'
});
}
... ...
... ... @@ -38,14 +38,14 @@ module.exports = {
// platformApi: 'http://192.168.102.48:8088/',
// prod
// singleApi: 'http://single.yoho.cn/',
// singleApi: 'http://api.yoho.cn/',
// api: 'http://api.yoho.cn/',
// service: 'http://api.yoho.cn/',
// serviceNotify: 'http://service.yoho.cn/',
// platformApi: 'http://172.16.6.210:8088/',
// gray
// singleApi: 'http://single.gray.yohops.com/',
// singleApi: 'http://apigray.yoho.cn/',
// api: 'http://apigray.yoho.cn/',
// service: 'http://apigray.yoho.cn/',
// platformApi: 'http://172.16.6.210:8088/',
... ... @@ -189,7 +189,7 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'yohobuy-node',
domains: {
singleApi: 'http://single.yoho.cn/',
singleApi: 'http://api.yoho.yohoops.org/',
api: 'http://api.yoho.yohoops.org/',
service: 'http://api.yoho.yohoops.org/',
search: 'http://search.yohoops.org/yohosearch/',
... ... @@ -250,7 +250,7 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'yohobuy-node',
domains: {
singleApi: process.env.TEST_API || 'http://192.168.102.31:8092/brower',
singleApi: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
service: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
global: process.env.TEST_GOLBAL || 'http://global-test-soa.yohops.com:9999/',
... ...