Authored by 陈峰

自测完成

... ... @@ -201,7 +201,7 @@ exports.myCoupons = (req, res, next) => {
let actId = req.params[2];
let nums = req.params[3];
let sign = req.query.sign;
let uid = req.cookies.inviteUid || '';
let uid = req.user.uid || req.query.uid || req.cookies.inviteUid || '';
// 这个只是过滤一下非法的参数
if (md5(amount + secretKey) !== sign || _.isEmpty(uid)) {
... ...
... ... @@ -136,7 +136,7 @@ let collocation = (req, res) => {
*/
let collocationList = (req, res, next) => {
let params = req.query;
let uid = req.cookies.guangStarUid || 0; // 客户端访问,不能使用 cookie
let uid = req.user.uid || req.query.uid || req.cookies.guangStarUid || 0; // 客户端访问,不能使用 cookie
starModel.getCollocationListData(params, uid).then((result) => {
res.render('star/list', _.assign({
... ... @@ -155,7 +155,7 @@ let collocationList = (req, res, next) => {
* @return {[type]}
*/
let setFavorite = (req, res, next) => {
let uid = req.cookies.guangStarUid || 0;
let uid = req.user.uid || req.query.uid || req.cookies.guangStarUid || 0;
let params = {
articleId: req.body.articleId,
type: req.body.type
... ... @@ -200,7 +200,7 @@ let detail = (req, res) => {
*/
let detailList = (req, res, next) => {
let params = req.query;
let uid = req.cookies.guangStarUid || 0;
let uid = req.user.uid || req.query.uid || req.cookies.guangStarUid || 0;
starModel.getDetailData(params, uid).then((result) => {
res.render('star/list', _.assign({
... ...
... ... @@ -141,4 +141,5 @@ let captcha = require('./controllers/captcha');
router.get('/passport/captcha/get', captcha.get);
router.get('/passport/img-check.jpg', captcha.imgCheck);
module.exports = router;
... ...
... ... @@ -2,7 +2,6 @@
const _ = require('lodash');
const cookie = global.yoho.cookie;
const config = global.yoho.config;
const authcode = require('../../utils/authcode');
module.exports = () => {
... ... @@ -41,24 +40,33 @@ module.exports = () => {
return req.cookies.app_uid;
},
sessionKey: req.cookies.app_session_key,
appVersion: req.cookies.app_version,
sessionType: req.cookies.app_session_type
appVersion: req.cookies.app_version || void 0,
appSessionType: req.cookies.app_client_type || void 0
};
}
if (!req.user.uid &&
(req.query.uid || req.cookies.app_uid) &&
(req.query.client_type || req.cookies.app_client_type) &&
(req.query.app_version || req.cookies.app_version)) {
let uid = req.query.uid || req.cookies.app_uid;
req.query.uid = {
toString: () => {
return _.parseInt(req.query.uid || req.cookies.app_uid);
return uid;
},
appVersion: req.query.app_version || req.cookies.app_version || config.appVersion
appVersion: req.query.app_version || req.cookies.app_version || void 0,
appSessionType: req.query.client_type || req.cookies.app_client_type || void 0
};
if (req.query.uid) {
res.cookie('app_uid', req.query.uid);
res.cookie('app_version', req.query.app_version || req.cookies.app_version || config.appVersion);
}
res.cookie('app_uid', req.query.uid.toString(), {
domain: 'm.yohobuy.com'
});
res.cookie('app_client_type', req.query.uid.appSessionType, {
domain: 'm.yohobuy.com'
});
res.cookie('app_version', req.query.uid.appVersion, {
domain: 'm.yohobuy.com'
});
}
next();
... ...