Merge branch 'master' into colonel

interface.ini

@@ -159,6 +159,8 @@ goods.marketing.yingxiao_list = "http://goods.int.yidian-inc.com/marketing/marke
 goods.marketing.toogle_yingxiao_online_status = "http://goods.int.yidian-inc.com/marketing/marketing/toogle_yingxiao_online_status"
 
 
+
+
 ;团长
 goods.marketing.second_distributor_list = "http://goods.int.yidian-inc.com/marketing/distributor/second_distributor_list"
 goods.marketing.apply_distributor = "http://goods.int.yidian-inc.com/marketing/distributor/apply_distributor"

lifeaccount.ini

@@ -4,8 +4,7 @@
 ; 生产环境
 [prod : common ]
 
-;life_account_id  =  "19019625839230981"
-life_account_id  =  "17963416161910792"
+life_account_id  =  "19019625839230981"
 
 ; 预发环境
 [perf : common]

redis.ini

@@ -67,13 +67,23 @@ cacheConnect.timeout=1
 cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
 
-[test-interaction : test-merchant : prod-merchant : merchant : common]
 
-[dev-interaction : test-merchant : prod-merchant : merchant : common]
 
-[prod-interaction : prod-merchant : merchant : common]
+
+[interaction : common]
+
+[prod-interaction : interaction : common]
 cacheConnect.mode='codis'
 cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18139/topom'
 cacheConnect.fallback=''
@@ -83,8 +93,38 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
-[pref-interaction : prod-interaction : prod-merchant : merchant : common]
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18139/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
+[pref-interaction : prod-interaction : interaction : common]
+
+[test-interaction : interaction : common]
+;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
 
+[dev-interaction : test-interaction : interaction : common]