Authored by 陈峰

Merge branch 'gray' into 'master'

Gray



See merge request !359
@@ -36,7 +36,7 @@ router.post('/ensure/compute', auth, ensure.compute); // 价格重新计算 @@ -36,7 +36,7 @@ router.post('/ensure/compute', auth, ensure.compute); // 价格重新计算
36 router.post('/ensure/submit', auth, csrf, ensure.submitCheck, ensure.submit); // 订单提交 36 router.post('/ensure/submit', auth, csrf, ensure.submitCheck, ensure.submit); // 订单提交
37 router.post('/property/checksms', ensure.sendCheckSms); // 虚拟资产使用校验 37 router.post('/property/checksms', ensure.sendCheckSms); // 虚拟资产使用校验
38 38
39 -router.get('/easypay', auth, easypay.index); // 限购商品快捷结算页 39 +router.get('/easypay', auth, csrf, easypay.index); // 限购商品快捷结算页
40 router.post('/easypay/compute', auth, easypay.compute); // 价格重新计算 40 router.post('/easypay/compute', auth, easypay.compute); // 价格重新计算
41 router.post('/easypay/submit', auth, easypay.submit); // 限购商品订单提交 41 router.post('/easypay/submit', auth, easypay.submit); // 限购商品订单提交
42 42
@@ -91,6 +91,7 @@ module.exports = { @@ -91,6 +91,7 @@ module.exports = {
91 maxFiles: 1, 91 maxFiles: 1,
92 tailable: true, 92 tailable: true,
93 maxsize: Math.pow(1024, 3), 93 maxsize: Math.pow(1024, 3),
  94 + zippedArchive: true,
94 timestamp() { 95 timestamp() {
95 return new Date().toString(); 96 return new Date().toString();
96 } 97 }
@@ -102,6 +103,7 @@ module.exports = { @@ -102,6 +103,7 @@ module.exports = {
102 maxFiles: 1, 103 maxFiles: 1,
103 tailable: true, 104 tailable: true,
104 maxsize: Math.pow(1024, 3), 105 maxsize: Math.pow(1024, 3),
  106 + zippedArchive: true,
105 handleExceptions: true, 107 handleExceptions: true,
106 timestamp() { 108 timestamp() {
107 return new Date().toString(); 109 return new Date().toString();