Merge branch 'feature/captcha-change' into release/6.3

@@ -86,12 +86,15 @@ module.exports = class extends global.yoho.BaseModel {
      * @param type $callback 成功后跳转链接
      * @return type
      */
-    sendVerifyEmailForNext(email, callback) {
+    sendVerifyEmailForNext(email, callback, id, captcha) {
 
         let data = {
             method: 'web.passport.sendVerifyEmailInfo',
             email: email,
-            callback: callback
+            callback: callback,
+            udid: id,
+            fromPage: PAGE,
+            degrees: captcha
         };
 
         return this.get({

@@ -923,6 +923,9 @@ module.exports = class extends global.yoho.BaseModel {
                 email = req.body.email || '',
                 resqData = {code: 400};
 
+            let id = req.session.id;
+            let captcha = req.body.verifyCode;
+
             let accountDataModel = new AccountApi(that.ctx),
                 verifyInfo = yield accountDataModel.getVerifyInfo(uid);
 
@@ -939,7 +942,7 @@ module.exports = class extends global.yoho.BaseModel {
             let callback = 'home/account/' + checkType + '?step=2&checkCode=' +
                 encodeURIComponent(ckCode); // callback拼接于邮箱域名处;
 
-            resqData = yield accountDataModel.sendVerifyEmailForNext(email, callback);
+            resqData = yield accountDataModel.sendVerifyEmailForNext(email, callback, id, captcha);
             return resqData;
         })();
     }

@@ -233,7 +233,7 @@ router.post('/account/verifypassword', tabsMiddleware.getCommonHeader, AccountCo
 
 router.post('/account/modifypwd', tabsMiddleware.getCommonHeader, AccountController.modifyPwd);
 
-router.post('/account/sendemail', AccountController.sendEmail);
+router.post('/account/sendemail', captcha.requiredAPI, AccountController.sendEmail);
 
 router.post('/account/checkemail', tabsMiddleware.getCommonHeader, AccountController.checkEmail);