Merge branch 'feature/interface-shut'

合并接口分流

@@ -27,7 +27,7 @@ class DetailAction extends YohoAction {
 
 
         let pid = req.params[0];
         let pid = req.params[0];
         let gid = req.params[1];
         let gid = req.params[1];
-        let uid = req.user.uid || '';
+        let uid = req.user.uid || req.query.uid  || '';  //TODO 测试分流用,测试后删除
         let vipLevel = detailHelper.vipLevel(req.user.vip);
         let vipLevel = detailHelper.vipLevel(req.user.vip);
         let saveCurrentGoodsInCookies = _.partial(service.saveRecentGoodInCookies,
         let saveCurrentGoodsInCookies = _.partial(service.saveRecentGoodInCookies,
             req.cookies._browse,
             req.cookies._browse,

@@ -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",