Merge branch 'master' of https://gitlab.yidian-inc.com/bp/yaconf

interface.ini

@@ -216,5 +216,7 @@ service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
 [interaction:common]
 [test-interaction : interaction : common]
 merchant.account.get_role_list  = "merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
+merchant.account.get_life_list  = "merchant.test.yidian-inc.com/lifeaccount/account/get_life_list"
 [dev-interaction : test-interaction : interaction : common]
 merchant.account.get_role_list  = "merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
+merchant.account.get_life_list  = "merchant.dev.yidian-inc.com/lifeaccount/account/get_life_list"
\ No newline at end of file

redis.ini

@@ -39,6 +39,15 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
+countConnect.mode='codis'
+countConnect.topom='http://10.126.165.6:18080/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
 
 [dev-interaction : test-merchant : prod-merchant : merchant : common]

xhprof.ini

 [common]
-gateway.host="rs_bp_test_01.int.yidian-inc.com:27018,rs_bp_test_02.int.yidian-inc.com:27018,rs_bp_test_03.int.yidian-inc.com:27018"
-gateway.uriOptions.username='rs_bp_test_rw'
-gateway.uriOptions.password='uE5bLz9#GSHXzhuaAeTDqll65mM@XC'
-gateway.uriOptions.replicaSet='rs_bp_test'
-gateway.uriOptions.readPreference='secondaryPreferred'
-gateway.uriOptions.connectTimeoutMS=500
-gateway.uriOptions.socketTimeoutMS=6000
-gateway.uriOptions.w=1
-gateway.uriOptions.wTimeoutMS=3000
-gateway.driverOptions.typeMap.root='array'
-gateway.driverOptions.typeMap.document='array'
\ No newline at end of file
+
+domain.bp_test_go2yd_com = 1
+domain.localhost         = 1
+
+
+[test-gateway : common]
\ No newline at end of file