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 { @@ -16,7 +16,8 @@ class storeHome extends global.yoho.BaseModel {
16 }, 16 },
17 param: { 17 param: {
18 code: 200 18 code: 200
19 - } 19 + },
  20 + api: global.yoho.ExtStoreAPI
20 }; 21 };
21 22
22 return this.get(options).then(result => { 23 return this.get(options).then(result => {
@@ -77,7 +78,8 @@ class storeHome extends global.yoho.BaseModel { @@ -77,7 +78,8 @@ class storeHome extends global.yoho.BaseModel {
77 }, 78 },
78 param: { 79 param: {
79 code: 200 80 code: 200
80 - } 81 + },
  82 + api: global.yoho.ExtStoreAPI
81 }; 83 };
82 84
83 return this.get(options).then(result => { 85 return this.get(options).then(result => {
@@ -113,7 +115,8 @@ class storeHome extends global.yoho.BaseModel { @@ -113,7 +115,8 @@ class storeHome extends global.yoho.BaseModel {
113 }, 115 },
114 param: { 116 param: {
115 code: 200 117 code: 200
116 - } 118 + },
  119 + api: global.yoho.ExtStoreAPI
117 }; 120 };
118 121
119 return this.get(options).then(result => { 122 return this.get(options).then(result => {
@@ -17,8 +17,9 @@ const domains = { @@ -17,8 +17,9 @@ const domains = {
17 singleApi: 'http://api-test3.yohops.com:9999/', 17 singleApi: 'http://api-test3.yohops.com:9999/',
18 imSocket: 'ws://socket.yohobuy.com:10240', 18 imSocket: 'ws://socket.yohobuy.com:10240',
19 imCs: 'http://im.yohobuy.com/api', 19 imCs: 'http://im.yohobuy.com/api',
20 - global: 'http://api-global.yohobuy.com',  
21 - store: 'http://192.168.102.47:8080/portal-gateway/' 20 + platformApi: 'http://192.168.102.48:8088/',
  21 + store: 'http://192.168.102.47:8080/portal-gateway/wechat/',
  22 + extstore: 'http://extstore-test1.yohops.com'
22 }; 23 };
23 24
24 module.exports = { 25 module.exports = {
@@ -137,7 +138,8 @@ if (isProduction) { @@ -137,7 +138,8 @@ if (isProduction) {
137 singleApi: 'http://single.yoho.cn/', 138 singleApi: 'http://single.yoho.cn/',
138 imSocket: 'wss://imsocket.yohobuy.com:443', 139 imSocket: 'wss://imsocket.yohobuy.com:443',
139 imCs: 'https://imhttp.yohobuy.com/api', 140 imCs: 'https://imhttp.yohobuy.com/api',
140 - platformApi: 'http://api.platform.yohoops.org' 141 + platformApi: 'http://api.platform.yohoops.org',
  142 + extstore: 'http://extstore.yohobuy.com'
141 }, 143 },
142 memcache: { 144 memcache: {
143 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 145 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
@@ -207,7 +209,8 @@ if (isProduction) { @@ -207,7 +209,8 @@ if (isProduction) {
207 singleApi: process.env.TEST_SINGLE || 'http://api-test1.yohops.com:9999/', 209 singleApi: process.env.TEST_SINGLE || 'http://api-test1.yohops.com:9999/',
208 imSocket: process.env.TEST_IM_SOCKET || 'ws://socket.yohobuy.com:10240', 210 imSocket: process.env.TEST_IM_SOCKET || 'ws://socket.yohobuy.com:10240',
209 imCs: process.env.TEST_IM_CS || 'http://im.yohobuy.com/api', 211 imCs: process.env.TEST_IM_CS || 'http://im.yohobuy.com/api',
210 - platformApi: 'http://192.168.102.48:8088/' 212 + platformApi: 'http://192.168.102.48:8088/',
  213 + extstore: 'http://extstore-test1.yohops.com'
211 }, 214 },
212 memcache: { 215 memcache: {
213 master: ['127.0.0.1:12111'], 216 master: ['127.0.0.1:12111'],
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 "xml2js": "^0.4.19", 73 "xml2js": "^0.4.19",
74 "yoho-express-session": "^2.0.0", 74 "yoho-express-session": "^2.0.0",
75 "yoho-md5": "^2.0.0", 75 "yoho-md5": "^2.0.0",
76 - "yoho-node-lib": "=0.3.5", 76 + "yoho-node-lib": "=0.3.6",
77 "yoho-zookeeper": "^1.0.8" 77 "yoho-zookeeper": "^1.0.8"
78 }, 78 },
79 "devDependencies": { 79 "devDependencies": {