Merge branch 'hotfix/session' into 'master'

修复分期sessionkey



See merge request !526

@@ -6,33 +6,36 @@ const authcode = require('../../utils/authcode');
 
 
 module.exports = () => {
 module.exports = () => {
     return (req, res, next) => {
     return (req, res, next) => {
-        // 从 SESSION 中获取到当前登录用户的 UID
-        if (req.session && _.isNumber(req.session.LOGIN_UID)) {
-            // 调用接口传参时切勿使用toString获得字符串
-            req.user.uid = {
-                toString: () => {
-                    return req.session.LOGIN_UID;
-                },
-                sessionKey: req.session.SESSION_KEY
-            };
-            let userData = _.get(req.session, 'USER', {});
 
 
-            _.merge(req.user, userData);
-        }
+        if (!req.yoho.isApp) {
+            // 从 SESSION 中获取到当前登录用户的 UID
+            if (req.session && _.isNumber(req.session.LOGIN_UID)) {
+                // 调用接口传参时切勿使用toString获得字符串
+                req.user.uid = {
+                    toString: () => {
+                        return _.parseInt(req.session.LOGIN_UID);
+                    },
+                    sessionKey: req.session.SESSION_KEY
+                };
+                let userData = _.get(req.session, 'USER', {});
 
 
-        // session 没有读取到的时候，从 cookie 读取 UID
-        if (!req.user.uid && req.cookies._UID) {
-            let sessionKey = req.cookies._SESSION_KEY && authcode(req.cookies._SESSION_KEY, '_SESSION_KEY', 2592000000);
+                _.merge(req.user, userData);
+            }
 
 
-            // 调用接口传参时切勿使用toString获得字符串
-            req.user.uid = {
-                toString: () => {
-                    return cookie.getUid(req);
-                },
-                sessionKey
-            };
-        }
+            // session 没有读取到的时候，从 cookie 读取 UID
+            if (!req.user.uid && req.cookies._UID) {
+                let sessionKey = req.cookies._SESSION_KEY &&
+                    authcode(req.cookies._SESSION_KEY, '_SESSION_KEY', 2592000000);
 
 
+                // 调用接口传参时切勿使用toString获得字符串
+                req.user.uid = {
+                    toString: () => {
+                        return _.parseInt(cookie.getUid(req));
+                    },
+                    sessionKey
+                };
+            }
+        }
         if (!req.user.uid &&
         if (!req.user.uid &&
             req.cookies.app_uid &&
             req.cookies.app_uid &&
             req.cookies.app_uid !== '0' &&
             req.cookies.app_uid !== '0' &&