Merge branch 'master' of http://git.yoho.cn/fe/yohobuy-node

@@ -76,9 +76,11 @@ const Auth = {
         return Auth.profile(uid).then((userInfo) => {
         return Auth.profile(uid).then((userInfo) => {
             let token = sign.makeToken(uid);
             let token = sign.makeToken(uid);
             let data = userInfo.data;
             let data = userInfo.data;
+            let encryptionUid = aes.encryptionUid(data.uid);
+
 
 
             if (data) {
             if (data) {
-                let uidCookie = `{data.profile_name}::${data.uid}::${data.vip_info.title}::${token}`;
+                let uidCookie = `{data.profile_name}::${encryptionUid}::${data.vip_info.title}::${token}`;
                 let isStudent = data.vip_info.is_student || 0;
                 let isStudent = data.vip_info.is_student || 0;
 
 
                 req.session._TOKEN = token;
                 req.session._TOKEN = token;

@@ -40,15 +40,7 @@ module.exports = {
         retries: 0
         retries: 0
     },
     },
     interfaceShunt: {
     interfaceShunt: {
-        useInterfaceShunt: false,
-        tencentServers: {
-            api: ['123.206.1.98', '123.206.2.80'],
-            service: ['123.206.1.98', '123.206.2.80']
-        },
-        awsServers: {
-            api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
-            service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
-        }
+        open: false
     },
     },
     loggers: {
     loggers: {
         infoFile: {
         infoFile: {
@@ -100,15 +92,8 @@ if (isProduction) {
         useOneapm: true,
         useOneapm: true,
         useCache: true,
         useCache: true,
         interfaceShunt: {
         interfaceShunt: {
-            useInterfaceShunt: false,
-            tencentServers: {
-                api: ['123.206.1.98', '123.206.2.80'],
-                service: ['123.206.1.98', '123.206.2.80']
-            },
-            awsServers: {
-                api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
-                service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
-            }
+            open: true,
+            url: 'http://123.206.2.55/strategy'
         }
         }
     });
     });
 } else if (isTest) {
 } else if (isTest) {

@@ -59,7 +59,7 @@
     "uuid": "^2.0.2",
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
     "winston-daily-rotate-file": "^1.1.4",
-    "yoho-node-lib": "0.0.40"
+    "yoho-node-lib": "0.0.46"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.6",
     "autoprefixer": "^6.3.6",