Merge branch 'hotfix/uri' into 'gray'

解决线上decodeURIComponent报错



See merge request !239

@@ -11,12 +11,18 @@ exports.index = (req, res, next) => {
     if (Number(appversion.substr(0, 1) < 5) || (Number(appversion.substr(0, 1)) === 5 && Number(appversion.substr(2, 1)) < 2)) {
     if (Number(appversion.substr(0, 1) < 5) || (Number(appversion.substr(0, 1)) === 5 && Number(appversion.substr(2, 1)) < 2)) {
         esc = true;
         esc = true;
     }
     }
+    let uname;
 
 
+    try {
+        uname = esc ? decodeURIComponent(params.uname) : decodeURIComponent(params.uname.replace(/\%/g, escape('%')));
+    } catch (e) {
+        uname = params.uname;
+    }
     model.getQr({
     model.getQr({
         token: params.token,
         token: params.token,
     }).then(result => {
     }).then(result => {
         params.token = result;
         params.token = result;
-        params.uname = esc ? decodeURIComponent(params.uname) : decodeURIComponent(params.uname.replace(/\%/g, escape('%')));
+        params.uname = uname;
         params.icon = params.icon || 'https://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}';
         params.icon = params.icon || 'https://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}';
         res.render('myqrcode', {
         res.render('myqrcode', {
             title: '查看二维码',
             title: '查看二维码',

@@ -11,7 +11,13 @@ const url = require('url');
  *  @return referer
  *  @return referer
  */
  */
 exports.refererLimit = (referer, blacklist) => {  // eslint-disable-line
 exports.refererLimit = (referer, blacklist) => {  // eslint-disable-line
-    let result = decodeURIComponent(referer || '/home');
+    let result;
+
+    try {
+        result = decodeURIComponent(referer || '/home');
+    } catch (e) {
+        result = referer || '/home';
+    }
 
 
     let urlObj = url.parse(result, false, true);
     let urlObj = url.parse(result, false, true);