App 判断逻辑修改

@@ -79,7 +79,7 @@ const common = {
         refer && !/signin|login|passport/.test(refer) && res.cookie('refer', encodeURI(refer), {
             domain: 'yohobuy.com'
         });
-        if (req.yoho.isApp || req.yoho.isMarsApp) {
+        if (req.yoho.isApp) {
             return next({
                 code: 401,
                 message: 'weblogin',

@@ -55,18 +55,16 @@ module.exports = () => {
         yoho.channel = channel;
 
         // 判断请求是否来自app
-        yoho.isApp = (req.query.app_version && req.query.app_version !== 'false') ||
-            (req.query.appVersion && req.query.appVersion !== 'false') ||
-            req.cookies.app_version || /YohoBuy/i.test(req.get('User-Agent') || '');
+        yoho.isMarsApp = /yohomars/i.test(req.get('User-Agent') || '');
+        yoho.isApp = yoho.isMarsApp ||
+            req.cookies.app_version ||
+            /YohoBuy/i.test(req.get('User-Agent') || '') ||
+            (req.query.app_version && req.query.app_version !== 'false') ||
+            (req.query.appVersion && req.query.appVersion !== 'false');
         yoho.isMobile = /(nokia|iphone|android|ipad|motorola|^mot\-|softbank|foma|docomo|kddi|up\.browser|up\.link|htc|dopod|blazer|netfront|helio|hosin|huawei|novarra|CoolPad|webos|techfaith|palmsource|blackberry|alcatel|amoi|ktouch|nexian|samsung|^sam\-|s[cg]h|^lge|ericsson|philips|sagem|wellcom|bunjalloo|maui|symbian|smartphone|midp|wap|phone|windows ce|iemobile|^spice|^bird|^zte\-|longcos|pantech|gionee|^sie\-|portalmmm|jig\s browser|hiptop|^ucweb|^benq|haier|^lct|opera\s*mobi|opera\*mini|320x320|240x320|176x220)/i.test(req.get('User-Agent') || ''); // eslint-disable-line
         yoho.isWechat = /micromessenger/i.test(req.get('User-Agent') || '');
         yoho.isWeibo = /weibo/i.test(req.get('User-Agent') || '');
         yoho.isqq = /MQQBrowser/i.test(req.get('User-Agent') || '');
-        yoho.isMarsApp = /yohomars/i.test(req.get('User-Agent') || '');
-
-        if (yoho.isMarsApp) {
-            yoho.isApp = false;
-        }
 
         Object.assign(res.locals, yoho);
         Object.assign(req.yoho, yoho);

@@ -8,7 +8,7 @@ const config = global.yoho.config;
 module.exports = () => {
     return (req, res, next) => {
 
-        if (!req.yoho.isApp && !req.yoho.isMarsApp) {
+        if (!req.yoho.isApp) {
             // 从 SESSION 中获取到当前登录用户的 UID
             if (req.session && _.isNumber(req.session.LOGIN_UID)) {
                 // 调用接口传参时切勿使用toString获得字符串