fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit 7b312ab25acb07bc20b025d65abc19e946204fff 2 parents 18998bcd db44d829

Merge branch 'feature/service' into release/6.1 

Conflicts:
	config/common.js
Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
@@ -19,15 +19,15 @@ module.exports = { @@ -19,15 +19,15 @@ module.exports = {
19 // test3 19 // test3
20 singleApi: 'http://api-test3.yohops.com:9999/', 20 singleApi: 'http://api-test3.yohops.com:9999/',
21 api: 'http://api-test3.yohops.com:9999/', 21 api: 'http://api-test3.yohops.com:9999/',
22 - service: 'http://service-test3.yohops.com:9999/',  
23 - serviceNotify: 'http://service-test3.yohops.com:9999/', 22 + service: 'http://api-test3.yohops.com:9999/',
  23 + serviceNotify: 'http://api-test3.yohops.com:9999/',
24 global: 'http://global-test-soa.yohops.com:9999/', 24 global: 'http://global-test-soa.yohops.com:9999/',
25 platformApi: 'http://192.168.102.48:8088/', 25 platformApi: 'http://192.168.102.48:8088/',
26 26
27 // test2 27 // test2
28 // singleApi: 'http://api-test2.yohops.com:9999/', 28 // singleApi: 'http://api-test2.yohops.com:9999/',
29 // api: 'http://api-test2.yohops.com:9999/', 29 // api: 'http://api-test2.yohops.com:9999/',
30 - // service: 'http://service-test2.yohops.com:9999/', 30 + // service: 'http://api-test2.yohops.com:9999/',
31 // serviceNotify: 'http://service-test2.yohops.com:9999/', 31 // serviceNotify: 'http://service-test2.yohops.com:9999/',
32 // global: 'http://global-test-soa.yohops.com:9999/', 32 // global: 'http://global-test-soa.yohops.com:9999/',
33 // platformApi: 'http://192.168.102.48:8088/', 33 // platformApi: 'http://192.168.102.48:8088/',
@@ -35,7 +35,7 @@ module.exports = { @@ -35,7 +35,7 @@ module.exports = {
35 // prod 35 // prod
36 // singleApi: 'http://single.yoho.cn/', 36 // singleApi: 'http://single.yoho.cn/',
37 // api: 'http://api.yoho.cn/', 37 // api: 'http://api.yoho.cn/',
38 - // service: 'http://service.yoho.cn/', 38 + // service: 'http://api.yoho.cn/',
39 // serviceNotify: 'http://service.yoho.cn/', 39 // serviceNotify: 'http://service.yoho.cn/',
40 // global: 'http://api-global.yohobuy.com/', 40 // global: 'http://api-global.yohobuy.com/',
41 // platformApi: 'http://172.16.6.210:8088/', 41 // platformApi: 'http://172.16.6.210:8088/',
@@ -43,12 +43,12 @@ module.exports = { @@ -43,12 +43,12 @@ module.exports = {
43 // gray 43 // gray
44 // singleApi: 'http://single.gray.yohops.com/', 44 // singleApi: 'http://single.gray.yohops.com/',
45 // api: 'http://api.gray.yohops.com/', 45 // api: 'http://api.gray.yohops.com/',
46 - // service: 'http://service.gray.yohops.com/', 46 + // service: 'http://api.gray.yohops.com/',
47 // platformApi: 'http://172.16.6.210:8088/', 47 // platformApi: 'http://172.16.6.210:8088/',
48 48
49 // dev 49 // dev
50 // api: 'http://dev-api.yohops.com:9999/', 50 // api: 'http://dev-api.yohops.com:9999/',
51 - // service: 'http://dev-service.yohops.com:9999/', 51 + // service: 'http://dev-api.yohops.com:9999/',
52 // serviceNotify: 'http://dev-service.yohops.com:9999/', 52 // serviceNotify: 'http://dev-service.yohops.com:9999/',
53 // singleApi: 'http://dev-api.yohops.com:9999/', 53 // singleApi: 'http://dev-api.yohops.com:9999/',
54 // platformApi: 'http://192.168.102.48:8088/', 54 // platformApi: 'http://192.168.102.48:8088/',
@@ -171,10 +171,10 @@ if (isProduction) { @@ -171,10 +171,10 @@ if (isProduction) {
171 domains: { 171 domains: {
172 singleApi: 'http://single.yoho.cn/', 172 singleApi: 'http://single.yoho.cn/',
173 api: 'http://api.yoho.yohoops.org/', 173 api: 'http://api.yoho.yohoops.org/',
174 - service: 'http://service.yoho.yohoops.org/', 174 + service: 'http://api.yoho.yohoops.org/',
175 search: 'http://search.yohoops.org/yohosearch/', 175 search: 'http://search.yohoops.org/yohosearch/',
176 global: 'http://api-global.yohobuy.com/', 176 global: 'http://api-global.yohobuy.com/',
177 - serviceNotify: 'http://service.yoho.cn/', 177 + serviceNotify: 'http://api.yoho.yohoops.org/',
178 imSocket: 'wss://imsocket.yohobuy.com:443', 178 imSocket: 'wss://imsocket.yohobuy.com:443',
179 imCs: 'https://imhttp.yohobuy.com/api', 179 imCs: 'https://imhttp.yohobuy.com/api',
180 platformApi: 'http://api.platform.yohoops.org', 180 platformApi: 'http://api.platform.yohoops.org',