Merge branch 'release/0704' into 'gray'

Release/0704



See merge request !1459

 'use strict';
 
+const _ = require('lodash');
 const semver = require('semver');
 const questionModel = require('../models/question');
 const headerModel = require('../../../doraemon/models/header'); // 头部model
+const geetest = require('../../passport/controllers/geetest');
 
 exports.list = (req, res, next) => {
     let canShare = false;
@@ -47,6 +49,35 @@ exports.check = (req, res, next) => {
     }).catch(next);
 };
 
+exports.geetestLoad = (req, res, next) => {
+    req.yoho.captchaShow = false;
+    res.locals.useGeetest = true;
+
+    if (_.has(res, 'locals.loadJsBefore')) {
+        res.locals.loadJsBefore.push({
+            src: global.yoho.config.geetestJs
+        });
+    } else {
+        res.locals.loadJsBefore = [
+            {
+                src: global.yoho.config.geetestJs
+            }
+        ];
+    }
+
+    return next();
+};
+
+exports.geetestCheck = (req, res, next) => {
+    let testCode = req.body.yohobuy;
+
+    if (testCode === global.yoho.config.testCode) {
+        return next();
+    }
+
+    return geetest.validate(req, res, next);
+};
+
 exports.submit = (req, res, next) => {
     let params = req.body;
 
@@ -66,8 +97,6 @@ exports.submit = (req, res, next) => {
     }).catch(next);
 };
 
-
-
 exports.detail = (req, res, next) => {
     let id = parseInt(`0${req.params.id}`, 10);
 

@@ -13,8 +13,6 @@ const check = require(`${cRoot}/check`);
 const question = require(`${cRoot}/question`);
 const auth = require('../../doraemon/middleware/auth');
 
-const validateCode = require('../passport/controllers/validateCode');
-
 // const material = require(`${cRoot}/material`);
 const materialNew = require(`${cRoot}/material-new`);
 
@@ -27,8 +25,8 @@ router.post('/check/submit', check.submit);
 
 router.get('/questionnaire', auth, question.list);
 router.post('/questionnaire/check', question.check);
-router.post('/questionnaire/submit', validateCode.check, question.submit);
-router.get('/questionnaire/:id', validateCode.load, question.detail);
+router.post('/questionnaire/submit', question.geetestCheck, question.submit);
+router.get('/questionnaire/:id', question.geetestLoad, question.detail);
 router.get('/material', auth, materialNew.list);
 
 module.exports = router;