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 { @@ -24,8 +24,7 @@ module.exports = class extends global.yoho.BaseModel {
24 type: 'shop', 24 type: 'shop',
25 method: 'app.favorite.queryFavoriteCountByShopIds' 25 method: 'app.favorite.queryFavoriteCountByShopIds'
26 }, 26 },
27 - url: '/favorite',  
28 - api: global.yoho.SingleAPI 27 + url: '/favorite'
29 }); 28 });
30 } 29 }
31 30
@@ -36,8 +35,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -36,8 +35,7 @@ module.exports = class extends global.yoho.BaseModel {
36 type: 'brand', 35 type: 'brand',
37 method: 'app.favorite.queryFavoriteCountByBrandId' 36 method: 'app.favorite.queryFavoriteCountByBrandId'
38 }, 37 },
39 - url: '/favorite',  
40 - api: global.yoho.SingleAPI 38 + url: '/favorite'
41 }); 39 });
42 } 40 }
43 41
@@ -38,14 +38,14 @@ module.exports = { @@ -38,14 +38,14 @@ module.exports = {
38 // platformApi: 'http://192.168.102.48:8088/', 38 // platformApi: 'http://192.168.102.48:8088/',
39 39
40 // prod 40 // prod
41 - // singleApi: 'http://single.yoho.cn/', 41 + // singleApi: 'http://api.yoho.cn/',
42 // api: 'http://api.yoho.cn/', 42 // api: 'http://api.yoho.cn/',
43 // service: 'http://api.yoho.cn/', 43 // service: 'http://api.yoho.cn/',
44 // serviceNotify: 'http://service.yoho.cn/', 44 // serviceNotify: 'http://service.yoho.cn/',
45 // platformApi: 'http://172.16.6.210:8088/', 45 // platformApi: 'http://172.16.6.210:8088/',
46 46
47 // gray 47 // gray
48 - // singleApi: 'http://single.gray.yohops.com/', 48 + // singleApi: 'http://apigray.yoho.cn/',
49 // api: 'http://apigray.yoho.cn/', 49 // api: 'http://apigray.yoho.cn/',
50 // service: 'http://apigray.yoho.cn/', 50 // service: 'http://apigray.yoho.cn/',
51 // platformApi: 'http://172.16.6.210:8088/', 51 // platformApi: 'http://172.16.6.210:8088/',
@@ -189,7 +189,7 @@ if (isProduction) { @@ -189,7 +189,7 @@ if (isProduction) {
189 Object.assign(module.exports, { 189 Object.assign(module.exports, {
190 appName: 'yohobuy-node', 190 appName: 'yohobuy-node',
191 domains: { 191 domains: {
192 - singleApi: 'http://single.yoho.cn/', 192 + singleApi: 'http://api.yoho.yohoops.org/',
193 api: 'http://api.yoho.yohoops.org/', 193 api: 'http://api.yoho.yohoops.org/',
194 service: 'http://api.yoho.yohoops.org/', 194 service: 'http://api.yoho.yohoops.org/',
195 search: 'http://search.yohoops.org/yohosearch/', 195 search: 'http://search.yohoops.org/yohosearch/',
@@ -250,7 +250,7 @@ if (isProduction) { @@ -250,7 +250,7 @@ if (isProduction) {
250 Object.assign(module.exports, { 250 Object.assign(module.exports, {
251 appName: 'yohobuy-node', 251 appName: 'yohobuy-node',
252 domains: { 252 domains: {
253 - singleApi: process.env.TEST_API || 'http://192.168.102.31:8092/brower', 253 + singleApi: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
254 api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/', 254 api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
255 service: process.env.TEST_API || 'http://testapi.yoho.cn:28078/', 255 service: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
256 global: process.env.TEST_GOLBAL || 'http://global-test-soa.yohops.com:9999/', 256 global: process.env.TEST_GOLBAL || 'http://global-test-soa.yohops.com:9999/',