Authored by 王水玲

Merge branch 'feature/passport' into release/4.8

... ... @@ -20,6 +20,7 @@ const router = express.Router(); // eslint-disable-line
// 兼容老的路由
router.get('/signin.html', login.common.beforeLogin, login.local.loginPage);
router.get('/reg.html', reg.index);
router.get('/logout.html', login.local.logout);
// 本地登录
router.get('/passport/login', login.common.beforeLogin, login.local.loginPage);
... ...
... ... @@ -27,7 +27,7 @@ module.exports = {
search: '//search.yohobuy.com',
huodong: '//huodong.yohobuy.com',
activity: '//activity.yohobuy.com',
index: '//www.yohobuy.com'
index: '//yohobuy.com'
},
useOneapm: false,
useCache: false,
... ...
... ... @@ -59,7 +59,7 @@
"uuid": "^2.0.2",
"winston": "^2.2.0",
"winston-daily-rotate-file": "^1.1.4",
"yoho-node-lib": "0.0.16"
"yoho-node-lib": "0.0.21"
},
"devDependencies": {
"autoprefixer": "^6.3.6",
... ...