Merge branch 'feature/force-bind2' into release/6.5

@@ -86,7 +86,6 @@ const cert = {
         let area = req.body.area;
 
         req.ctx(CertService).sendCertMsg(mobile, area).then(result => {
-            console.log(result);
             if (result && result.code) {
                 return res.json(result);
             } else {
@@ -100,20 +99,20 @@ const cert = {
         let code = _.trim(req.body.code);
 
         if (!code) {
-            return {
+            return res.json({
                 code: 400,
                 message: '短信验证码错误'
-            };
+            });
         }
 
         if (!req.session.forceBind ||
             !req.session.forceBind.username ||
             !req.session.forceBind.password
         ) {
-            return {
+            return res.json({
                 code: 400,
                 message: '请重新登录'
-            };
+            });
         }
 
         req.ctx(CertService).certMobile(
@@ -131,9 +130,10 @@ const cert = {
             }
 
             return req.ctx(LoginService).syncUserSession(result.data, req, res).then(() => {
-                return {code: 200, message: result.message};
+                return res.json({code: 200, message: result.message});
+            }).catch(() => {
+                return res.json({code: 200, message: result.message});
             });
-
         }).catch(() => {
             delete req.session.forceBind;
             next();