Authored by 周少峰

Merge branch 'hotfix/yasupgraded'

1 { 1 {
2 "name": "yohobuy-node", 2 "name": "yohobuy-node",
3 - "version": "5.3.7", 3 + "version": "5.3.9",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -60,6 +60,7 @@ @@ -60,6 +60,7 @@
60 "request-promise": "^3.0.0", 60 "request-promise": "^3.0.0",
61 "serve-favicon": "^2.3.0", 61 "serve-favicon": "^2.3.0",
62 "uuid": "^2.0.2", 62 "uuid": "^2.0.2",
  63 + "yoho-express-session": "^2.0.0",
63 "yoho-node-lib": "0.2.2", 64 "yoho-node-lib": "0.2.2",
64 "yoho-zookeeper": "^1.0.6" 65 "yoho-zookeeper": "^1.0.6"
65 }, 66 },
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
7 "exec_mode": "cluster", 7 "exec_mode": "cluster",
8 "merge_logs": true, 8 "merge_logs": true,
9 "log_date_format": "YYYY-MM-DD HH:mm Z", 9 "log_date_format": "YYYY-MM-DD HH:mm Z",
  10 + "error_file": "/Data/logs/node/yohobuy-node-err.log",
  11 + "out_file": "/Data/logs/node/yohobuy-node-out.log",
10 "env": { 12 "env": {
11 "TZ": "Asia/Shanghai", 13 "TZ": "Asia/Shanghai",
12 "PORT": 6002 14 "PORT": 6002
@@ -109,7 +109,7 @@ function getShoppingKey() { @@ -109,7 +109,7 @@ function getShoppingKey() {
109 a.src = j; 109 a.src = j;
110 m.parentNode.insertBefore(a, m); 110 m.parentNode.insertBefore(a, m);
111 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://' + // eslint-disable-line 111 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://' + // eslint-disable-line
112 - 'cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas')); // eslint-disable-line 112 + 'cdn.yoho.cn/yas-jssdk/2.1.0/yas.js', '_yas')); // eslint-disable-line
113 113
114 (function() { 114 (function() {
115 var uid = getUid(); 115 var uid = getUid();
@@ -119,7 +119,7 @@ function getShoppingKey() { @@ -119,7 +119,7 @@ function getShoppingKey() {
119 window._ozuid = uid; // 暴露ozuid 119 window._ozuid = uid; // 暴露ozuid
120 120
121 if (window._yas) { 121 if (window._yas) {
122 - window._yas(1 * new Date(), '1.0.18', 'yohobuy_web', uid, '', ''); 122 + window._yas(1 * new Date(), '2.1.0', 'yohobuy_web', uid, '', '');
123 } 123 }
124 }()); 124 }());
125 125