Merge branch 'master' into 'release/6.9.2'

jssdk update and 401 jsonp



See merge request !1739

@@ -133,7 +133,7 @@ module.exports = {
         notifyUrl: domains.service + 'payment/weixin_notify',
         notifyUrl: domains.service + 'payment/weixin_notify',
     },
     },
     geetestJs: '//static.geetest.com/static/tools/gt.js',
     geetestJs: '//static.geetest.com/static/tools/gt.js',
-    jsSdk: '//cdn.yoho.cn/js-sdk/1.3.20/jssdk.js',
+    jsSdk: '//cdn.yoho.cn/js-sdk/1.3.21/jssdk.js',
     redis: {
     redis: {
         connect: {
         connect: {
             host: '192.168.102.49',
             host: '192.168.102.49',

@@ -180,6 +180,9 @@ exports.serverError = () => {
 
 
             if (req.xhr) {
             if (req.xhr) {
                 return res.status(401).json(err);
                 return res.status(401).json(err);
+            } else if (req.jsonp) {
+                err.auth = true;
+                return res.jsonp(err);
             } else if (req.yoho.isApp) {
             } else if (req.yoho.isApp) {
                 if (err.lowVersion) {
                 if (err.lowVersion) {
                     return res.render('error/app-auth', {
                     return res.render('error/app-auth', {