完善微信登录逻辑

@@ -81,7 +81,9 @@ const common = {
         let passLogin = _.get(req, 'cookies._WX_PASS_LOGIN', false);
         let passLogin = _.get(req, 'cookies._WX_PASS_LOGIN', false);
 
 
         if (req.yoho.isWechat && !passLogin) {
         if (req.yoho.isWechat && !passLogin) {
-            return res.redirect('/passport/login/wechat');
+            return res.redirect(helpers.urlFormat('/passport/login/wechat', {
+                refer: req.query.refer || req.get('Referer') || '/'
+            }));
         }
         }
         next();
         next();
     },
     },
@@ -170,8 +172,6 @@ const local = {
         // 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
         // 设置登录有效时间30分钟, 防机器刷，cache不稳定，改为cookie
         // res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
         // res.cookie('LE' + md5('_LOGIN_EXPIRE'), (new Date()).getTime() / 1000 + 1800);
 
 
-
-
         res.render('international', {
         res.render('international', {
             width750: true,
             width750: true,
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
@@ -250,6 +250,18 @@ const local = {
 
 
 const wechat = {
 const wechat = {
     login: (req, res, next) => {
     login: (req, res, next) => {
+        // 微信里边已经登录的时候，不再跳转登录
+        if (req.user.uid) {
+            let refer = req.query.refer || decodeURI(req.cookies.refer) || config.siteUrl;
+
+            if (/sign|login/.test(refer)) {
+                refer = `${config.siteUrl}/home`;
+            }
+
+            refer = utils.refererLimit(refer);
+            return res.redirect(refer);
+        }
+
         // 设置为原链接标识originalUrl
         // 设置为原链接标识originalUrl
         req.session.originalUrl = 'true';
         req.session.originalUrl = 'true';
         req.session.authState = uuid.v4();
         req.session.authState = uuid.v4();

@@ -2,6 +2,7 @@
 const _ = require('lodash');
 const _ = require('lodash');
 const aes = require('./aes-pwd');
 const aes = require('./aes-pwd');
 const authcode = require('../../../utils/authcode');
 const authcode = require('../../../utils/authcode');
+const logger = global.yoho.logger;
 const sign = global.yoho.sign;
 const sign = global.yoho.sign;
 const api = global.yoho.API;
 const api = global.yoho.API;
 const uuid = require('uuid');
 const uuid = require('uuid');
@@ -35,10 +36,13 @@ class Auth {
             param.shopping_key = shoppingKey;
             param.shopping_key = shoppingKey;
         }
         }
 
 
+        logger.info(`${profile}, login from ${ip}`);
+
         return api.post('', param, {
         return api.post('', param, {
             headers: {
             headers: {
                 'user-agent': 'yoho/nodejs',
                 'user-agent': 'yoho/nodejs',
-                'X-YOHO-IP': ip
+                'X-YOHO-IP': ip,
+                'X-Forwarded-For': ip
             }
             }
         });
         });
     }
     }

@@ -27,7 +27,7 @@ const router = express.Router(); // eslint-disable-line
 router.get('/passport/geetest/register', geetest.register);
 router.get('/passport/geetest/register', geetest.register);
 
 
 // 兼容老的路由
 // 兼容老的路由
-router.get('/signin.html', validateCode.load, login.common.weixinCheck,
+router.get('/signin.html', login.common.weixinCheck, validateCode.load,
  login.common.beforeLogin, login.common.clearCookie, smsLogin.loginPage);
  login.common.beforeLogin, login.common.clearCookie, smsLogin.loginPage);
 router.get('/reg.html', validateCode.load, disableBFCahce, reg.index);
 router.get('/reg.html', validateCode.load, disableBFCahce, reg.index);
 router.get('/login.html', validateCode.load,
 router.get('/login.html', validateCode.load,
@@ -78,10 +78,6 @@ router.get('/passport/login/qq/callback', login.qq.callback);
 router.get('/passport/login/alipay', login.common.beforeLogin, login.alipay.login);
 router.get('/passport/login/alipay', login.common.beforeLogin, login.alipay.login);
 router.get('/passport/login/alipay/callback', login.alipay.callback);
 router.get('/passport/login/alipay/callback', login.alipay.callback);
 
 
-// alipay登录
-router.get('/login/alipay', login.common.beforeLogin, login.alipay.login);
-router.get('/login/alipay/callback', login.alipay.callback);
-
 // 登录绑定
 // 登录绑定
 router.get('/passport/bind/index', validateCode.load, bind.indexPage);
 router.get('/passport/bind/index', validateCode.load, bind.indexPage);
 router.post('/passport/bind/bindCheck', validateCode.check, bind.bindCheck);
 router.post('/passport/bind/bindCheck', validateCode.check, bind.bindCheck);