Authored by 毕凯

Merge branch 'release/6.5.5' into 'gray'

wechat-login



See merge request !1339
@@ -44,9 +44,9 @@ router.post('/passport/sms_login/password.json', smsLogin.password); @@ -44,9 +44,9 @@ router.post('/passport/sms_login/password.json', smsLogin.password);
44 router.get('/passport/login/user', login.user); 44 router.get('/passport/login/user', login.user);
45 45
46 // // 微信登录 46 // // 微信登录
47 -// router.get('/passport/login/wechat', login.common.beforeLogin, login.common.isLoginUser, login.wechat.login);  
48 -// router.get('/passport/login/wechat/callback', login.wechat.callback);  
49 -// router.get('/passport/login/wechat/redirect', login.wechat.redirect); 47 +router.get('/passport/login/wechat', login.common.beforeLogin, login.common.isLoginUser, login.wechat.login);
  48 +router.get('/passport/login/wechat/callback', login.wechat.callback);
  49 +router.get('/passport/login/wechat/redirect', login.wechat.redirect);
50 50
51 // // sina登录 51 // // sina登录
52 // router.get('/passport/login/sina', login.common.beforeLogin, login.sina.login); 52 // router.get('/passport/login/sina', login.common.beforeLogin, login.sina.login);