prepare merge to master

@@ -26,7 +26,7 @@ exports.index = (req, res, next) => {
     if (!req.params[0] || !req.params[1]) {
     if (!req.params[0] || !req.params[1]) {
         return next();
         return next();
     }
     }
-    let uid = req.user.uid || req.query.uid || 0; // 接口分流测试
+    let uid = req.user.uid || 0;
     let headerData = headerModel.setNav({
     let headerData = headerModel.setNav({
         navTitle: '商品详情'
         navTitle: '商品详情'
     });
     });

@@ -40,8 +40,7 @@ module.exports = {
         retries: 0
         retries: 0
     },
     },
     interfaceShunt: {
     interfaceShunt: {
-        open: true,
-        url: 'http://192.168.102.205:9000/strategy'
+        open: false
     },
     },
     loggers: {
     loggers: {
         infoFile: {
         infoFile: {
@@ -91,15 +90,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) {

@@ -56,7 +56,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.44"
+    "yoho-node-lib": "0.0.46"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.7",
     "autoprefixer": "^6.3.7",