品牌

@@ -209,7 +209,7 @@ const getBrandByChannel = (channel) => {
 
                 build.push({
                     title: key
-});
+                });
 
                 allList[key].forEach(row => {
 

@@ -11,14 +11,17 @@ const isTest = process.env.NODE_ENV === 'test';
 
 module.exports = {
     app: 'h5',
-    appVersion: '4.9.2', // 调用api的版本
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     domains: {
-        api: 'http://api.yoho.yohoops.org/',
-        service: 'http://service.yoho.yohoops.org/',
-        liveApi: 'http://api.live.yoho.cn/'
+        // api: 'http://devapi.yoho.cn:58078/',
+        // service: 'http://devservice.yoho.cn:58077/'
+        api: 'http://api.yoho.cn/',
+
+        // service: 'http://service.yoho.cn/',
+        service: 'http://service-test3.yohops.com:9999/',
+        liveApi: 'http://testapi.live.yohops.com:9999/'
     },
     subDomains: {
         host: '.m.yohobuy.com',
@@ -30,16 +33,25 @@ module.exports = {
         activity: '//activity.yohobuy.com',
         index: '//m.yohobuy.com'
     },
+    useOneapm: false,
     useCache: false,
     memcache: {
-        master: ['192.168.102.168:12111'],
-        slave: ['192.168.102.168:12111'],
-        session: ['192.168.102.168:12111'],
+        master: ['192.168.102.205:12111'],
+        slave: ['192.168.102.205:12111'],
+        session: ['192.168.102.205:12111'],
         timeout: 1000,
         retries: 0
     },
     interfaceShunt: {
-        open: false
+        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'
+        }
     },
     loggers: {
         infoFile: {
@@ -87,13 +99,21 @@ if (isProduction) {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
             slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
             session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
-            timeout: 100,
+            timeout: 1000,
             retries: 0
         },
+        useOneapm: true,
         useCache: true,
         interfaceShunt: {
-            open: false,
-            url: 'http://123.206.2.55/strategy'
+            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'
+            }
         }
     });
 } else if (isTest) {
@@ -101,17 +121,18 @@ if (isProduction) {
         appName: 'm.yohobuy.com for test',
         assetUrl: '//cdn.yoho.cn/m-yohobuy-node/assets',
         domains: {
-            api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
-            service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
-            liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/'
+            api: 'http://api-test3.yohops.com:9999/',
+            service: 'http://service-test3.yohops.com:9999/',
+            liveApi: 'http://testapi.live.yohops.com:9999/'
         },
         memcache: {
             master: ['127.0.0.1:12111'],
             slave: ['127.0.0.1:12112'],
             session: ['127.0.0.1:12111'],
-            timeout: 100,
+            timeout: 1000,
             retries: 0
         },
+        useOneapm: true,
         useCache: true
     });
 }