Merge branch 'feature/passport' into release/4.8

@@ -81,7 +81,7 @@ let index = (req, res, next) => {
             passport: {
             passport: {
                 region: passportHelper.getCountry(),
                 region: passportHelper.getCountry(),
                 location: '+86',
                 location: '+86',
-                captchaUrl: helpers.urlFormat('/passport/images', {t: Date.now()}),
+                captchaUrl: helpers.urlFormat('/passport/imagesNode', {t: Date.now()}),
                 itemUrl: helpers.urlFormat('/help/', {category_id: 9}),
                 itemUrl: helpers.urlFormat('/help/', {category_id: 9}),
                 referUrl: refer,
                 referUrl: refer,
                 loginUrl: helpers.urlFormat('/passport/login', {refer: refer}),
                 loginUrl: helpers.urlFormat('/passport/login', {refer: refer}),

@@ -108,7 +108,7 @@ const indexPageDataAsync = () => {
                 coverImg: banner.img,
                 coverImg: banner.img,
                 countryCode: 86,
                 countryCode: 86,
                 countryName: '中国',
                 countryName: '中国',
-                captchaUrl: helpers.urlFormat('/passport/images', {t: moment().unix()}),
+                captchaUrl: helpers.urlFormat('/passport/imagesNode', {t: moment().unix()}),
                 countryList: countryList
                 countryList: countryList
             }
             }
         };
         };

@@ -150,6 +150,6 @@ router.get('/passport/back/resetSuccess',
     back.validateSuccessStatusPage,
     back.validateSuccessStatusPage,
     back.resetPwdSuccessPage);
     back.resetPwdSuccessPage);
 
 
-router.get('/passport/images', captcha.generate);
+router.get('/passport/imagesNode', captcha.generate);
 
 
 module.exports = router;
 module.exports = router;

@@ -25,7 +25,7 @@ var mailAc = require('../common/ac-email'); // 邮箱自动完成
 
 
 var $remember = $('.remember-me');
 var $remember = $('.remember-me');
 
 
-var captchaUrl = '/passport/images?t='; // /passport/images?t=1454464125
+var captchaUrl = '/passport/imagesNode?t='; // /passport/images?t=1454464125
 
 
 var $captchaWrap = $('.captcha-wrap'),
 var $captchaWrap = $('.captcha-wrap'),
     $captchaImg = $captchaWrap.find('#captcha-img');
     $captchaImg = $captchaWrap.find('#captcha-img');