Authored by 毕凯

Merge branch 'hotfix/sms' into 'master'

Hotfix/sms



See merge request !1004
... ... @@ -23,6 +23,7 @@ const thirdAccount = require('../data/third-account.json');
const auth = require('../models/auth-helper');
const loginPage = `${config.siteUrl}/signin.html`;
const FROM = require('../../../config/from');
function doPassportCallback(openId, nickname, sourceType, req, res) {
let shoppingKey = cookie.getShoppingKey(req);
... ... @@ -152,7 +153,7 @@ const common = {
let from = req.query.from;
if (from) {
if (from && FROM[from]) {
res.cookie('from', from, {
domain: 'yohobuy.com',
expires: new Date(Date.now() + 10 * 60 * 1000)
... ...