fe / yohobuy-node · Commits

Go to a project

Authored by 李奇
Commit 3e1c585879d188da1ca712059a7b94bc82b5189d 1 parent f8a68232

图片上传服务url变更对应

Inline Side-by-side
Showing 2 changed files with 10 additions and 13 deletions
@@ -22,22 +22,21 @@ module.exports = { @@ -22,22 +22,21 @@ module.exports = {
22 // service: 'http://service-test3.yohops.com:9999/', 22 // service: 'http://service-test3.yohops.com:9999/',
23 23
24 // prod 24 // prod
25 - singleApi: 'http://single.yoho.cn/',  
26 - api: 'http://api.yoho.cn/',  
27 - service: 'http://service.yoho.cn/', 25 + singleApi: 'http://single.yoho.cn/',
  26 + api: 'http://api.yoho.cn/',
  27 + service: 'http://service.yoho.cn/',
28 28
29 // gray 29 // gray
30 - //singleApi: 'http://single.gray.yohops.com/',  
31 - //api: 'http://api.gray.yohops.com/',  
32 - //service: 'http://service.gray.yohops.com/', 30 + // singleApi: 'http://single.gray.yohops.com/',
  31 + // api: 'http://api.gray.yohops.com/',
  32 + // service: 'http://service.gray.yohops.com/',
33 33
34 // dev 34 // dev
35 // api: 'http://dev-api.yohops.com:9999/', 35 // api: 'http://dev-api.yohops.com:9999/',
36 // service: 'http://dev-service.yohops.com:9999/', 36 // service: 'http://dev-service.yohops.com:9999/',
37 37
38 imSocket: 'ws://socket.yohobuy.com:10240', 38 imSocket: 'ws://socket.yohobuy.com:10240',
39 - imCs: 'http://im.yohobuy.com/api',  
40 - imServer: 'http://im.yohobuy.com/server' 39 + imCs: 'http://im.yohobuy.com/api'
41 }, 40 },
42 subDomains: { 41 subDomains: {
43 host: '.yohobuy.com', 42 host: '.yohobuy.com',
@@ -130,8 +129,7 @@ if (isProduction) { @@ -130,8 +129,7 @@ if (isProduction) {
130 service: 'http://service.yoho.yohoops.org/', 129 service: 'http://service.yoho.yohoops.org/',
131 search: 'http://search.yohoops.org/yohosearch/', 130 search: 'http://search.yohoops.org/yohosearch/',
132 imSocket: 'ws://imsocket.yohobuy.com:10000', 131 imSocket: 'ws://imsocket.yohobuy.com:10000',
133 - imCs: 'https://imhttp.yohobuy.com/api',  
134 - imServer: 'https://imhttp.yohobuy.com/server' 132 + imCs: 'https://imhttp.yohobuy.com/api'
135 }, 133 },
136 memcache: { 134 memcache: {
137 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 135 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
@@ -160,8 +158,7 @@ if (isProduction) { @@ -160,8 +158,7 @@ if (isProduction) {
160 service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/', 158 service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
161 search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/', 159 search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/',
162 imSocket: 'ws://socket.yohobuy.com:10240', 160 imSocket: 'ws://socket.yohobuy.com:10240',
163 - imCs: 'http://im.yohobuy.com/api',  
164 - imServer: 'http://im.yohobuy.com/server' 161 + imCs: 'http://im.yohobuy.com/api'
165 }, 162 },
166 useOneapm: true, 163 useOneapm: true,
167 useCache: true, 164 useCache: true,
@@ -996,7 +996,7 @@ function pageInit() { @@ -996,7 +996,7 @@ function pageInit() {
996 dataType: 'json', 996 dataType: 'json',
997 acceptFileTypes: /(\.|\/)(bmp|gif|jpe?g|png)$/i, 997 acceptFileTypes: /(\.|\/)(bmp|gif|jpe?g|png)$/i,
998 maxFileSize: 5000000, // 5M 998 maxFileSize: 5000000, // 5M
999 - url: configDomains.imServer + '/fileManage/uploadFile', 999 + url: configDomains.imCs + '/fileManage/uploadFile',
1000 progressall: function(e, data) { 1000 progressall: function(e, data) {
1001 var progress = parseInt(data.loaded / data.total * 100, 10); 1001 var progress = parseInt(data.loaded / data.total * 100, 10);
1002 1002