fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit c2de2a3db0ac686048bf7c10977e4d3f5fdbe18c 2 parents 34fe3a59 f61dbe8b

Merge branch 'release/wap-optim' of http://git.yoho.cn/fe/yohobuywap-node into release/wap-optim

Inline Side-by-side
Showing 3 changed files with 7 additions and 14 deletions
@@ -72,6 +72,8 @@ class Auth { @@ -72,6 +72,8 @@ class Auth {
72 let encryptionUid = aes.encryptionUid(uid); 72 let encryptionUid = aes.encryptionUid(uid);
73 73
74 if (data) { 74 if (data) {
  75 + data.profile_name = (data.profile_name || '').replace(/::/g, '');
  76 +
75 let uidCookie = `${data.profile_name}::${encryptionUid}::${data.vip_info && data.vip_info.title}::${token}`; 77 let uidCookie = `${data.profile_name}::${encryptionUid}::${data.vip_info && data.vip_info.title}::${token}`;
76 78
77 res.cookie('_UID', uidCookie, { 79 res.cookie('_UID', uidCookie, {
@@ -466,7 +466,7 @@ const _formShopData = (data, shopId, isApp) => { @@ -466,7 +466,7 @@ const _formShopData = (data, shopId, isApp) => {
466 }, formatData); 466 }, formatData);
467 } else { 467 } else {
468 formatData = _.assign({ 468 formatData = _.assign({
469 - allGoods: `${helpers.urlFormat('', allGoodsParam, 'search')}&openby:yohobuy={"action":"go.list","params":{"title":"全部商品", "actiontype":"0","shop_id":${shopId},"page":"1"}}`,//eslint-disable-line 469 + allGoods: `${helpers.urlFormat('', allGoodsParam, 'search')}&openby:yohobuy={"action":"go.list","params":{"title":"全部商品", "actiontype":"0","shop_id":${shopId}}}`,//eslint-disable-line
470 shopIntroHref: helpers.urlFormat('/product/index/intro', { 470 shopIntroHref: helpers.urlFormat('/product/index/intro', {
471 shop_id: shopId, 471 shop_id: shopId,
472 app_version: isApp 472 app_version: isApp
@@ -21,20 +21,11 @@ module.exports = { @@ -21,20 +21,11 @@ module.exports = {
21 liveApi: 'http://api.live.yoho.cn/', 21 liveApi: 'http://api.live.yoho.cn/',
22 singleApi: 'http://single.yoho.cn/' 22 singleApi: 'http://single.yoho.cn/'
23 23
24 - //api: 'http://api-test3.yohops.com:9999/',  
25 - //service: 'http://service-test3.yohops.com:9999/',  
26 - //liveApi: 'http://testapi.live.yohops.com:9999/',  
27 - //singleApi: 'http://api-test3.yohops.com:9999/' 24 + // api: 'http://api-test3.yohops.com:9999/',
  25 + // service: 'http://service-test3.yohops.com:9999/',
  26 + // liveApi: 'http://testapi.live.yohops.com:9999/',
  27 + // singleApi: 'http://api-test3.yohops.com:9999/'
28 28
29 - // favApi: 'http://192.168.102.31:8092/brower',  
30 - // api: 'http://192.168.102.205:8080/gateway/',  
31 - // service: 'http://192.168.102.205:8080/gateway/',  
32 - // search: 'http://192.168.102.216:8080/yohosearch/'  
33 -  
34 - // api: 'http://api.yoho.yohoops.org/',  
35 - // service: 'http://service.yoho.yohoops.org/',  
36 - // liveApi: 'http://api.live.yoho.cn/',  
37 - // singleApi: 'http://single.yoho.cn/'  
38 29
39 // api: 'http://dev-api.yohops.com:9999/', 30 // api: 'http://dev-api.yohops.com:9999/',
40 // service: 'http://dev-service.yohops.com:9999/', 31 // service: 'http://dev-service.yohops.com:9999/',