Merge branch 'feature/loginview' into 'release/6.0.1'

del-fortest



See merge request !822

@@ -82,20 +82,7 @@ const load = (req, res, next) => {
     return next();
 };
 
-/**
- * 测试使用，上线前删除
- */
-const forTest = (req, res, next) => {
-    if (req.query.image) {
-        _.set(req, 'app.locals.wap.geetest.validation', true);
-    } else {
-        _.set(req, 'app.locals.wap.geetest.validation', false);
-    }
-    return next();
-};
-
 module.exports = {
     check,
-    load,
-    forTest
+    load
 };

@@ -176,7 +176,6 @@ const BackNew = require('./controllers/back-new');
 const backNew = new BackNew();
 
 router.get('/passport/login',
-    validateCode.forTest, // 测试使用，上灰度前删除
     validateCode.load,
     login.common.beforeLogin,
     login.common.clearCookie,
@@ -189,27 +188,23 @@ router.get('/passport/international',
     login.loginShowCaptchaByIp,
     loginNew.international); // 国际账号登录
 router.get('/passport/reg/index',
-    validateCode.forTest, // 测试使用，上灰度前删除
     validateCode.load,
     regNew.regPage); // 注册页面
 router.post('/passport/register-new',
     reg.sendCodeBusyBoy,
     regNew.register); // 注册请求
 router.get('/passport/sms_login',
-    validateCode.forTest, // 测试使用，上灰度前删除
     validateCode.load,
     smsNew.smsLoginPage); // 短信验证码登录
 
 // 兼容老的路由
 router.get('/signin.html',
     login.common.weixinCheck,
-    validateCode.forTest, // 测试使用，上灰度前删除
     validateCode.load,
     login.common.beforeLogin,
     login.common.clearCookie,
     smsNew.smsLoginPage); // 短信验证码登录
 router.get('/reg.html',
-    validateCode.forTest, // 测试使用，上灰度前删除
     validateCode.load,
     regNew.regPage); // 注册页面
 router.get('/login.html',