Merge branch 'master' into release/node-gzip

@@ -328,15 +328,15 @@ exports.school = (req, res, next) => {
 exports.verifyidentity = (req, res, next) => {
 exports.verifyidentity = (req, res, next) => {
     // let uid=req.user.id;
     // let uid=req.user.id;
     let params = req.body;
     let params = req.body;
+    let uid = req.__USER__.uid;
     let url = 'http://m.yohobuy.com/activity/student/verify?' +
     let url = 'http://m.yohobuy.com/activity/student/verify?' +
         queryString.stringify({
         queryString.stringify({
             college_name: params.college_name,
             college_name: params.college_name,
             education_degree: params.education_degree,
             education_degree: params.education_degree,
-            enrollment_year: params.enrollment_year
+            enrollment_year: params.enrollment_year,
+            uid: req.__USER__.isApp ? uid : '',
         }) + '&';
         }) + '&';
 
 
-    let uid = req.__USER__.uid;
-
     verifyIdentity(uid, params.cert_no, params.name, url).then((result) => {
     verifyIdentity(uid, params.cert_no, params.name, url).then((result) => {
         res.json(result);
         res.json(result);
     }).catch(next);
     }).catch(next);