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

mysql.ini

@@ -83,7 +83,7 @@ fu.write.host='10.136.150.2:3307'
 fu.read.host='10.136.150.2:3307'
 
 ; 预发环境
-[perf-merchant : prod-merchant : merchant : common]
+[perf-interaction : prod-interaction : interaction : common]
 
 ; 测试环境
 [test-interaction : interaction : common]

redis.ini

@@ -67,6 +67,15 @@ 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]
 
 
@@ -84,7 +93,16 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
-[pref-interaction : prod-interaction : interaction : 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=''
+
+[perf-interaction : prod-interaction : interaction : common]
 
 [test-interaction : interaction : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
@@ -94,9 +112,18 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='igbinary'
+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]
 
 

wallet.ini

@@ -8,7 +8,7 @@ withdraw.day_total_amount = 100000;
 ;Ping++轮训条数
 withdraw.pinpp_sync_limit = 100;
 ;提现审核阈值，超过进审核列表 单位 分
-withdraw.withdraw_apply_amount = 500;
+withdraw.withdraw_apply_amount = 10;
 ;关闭提现 0 打开 1 关闭
 withdraw.is_closed = 0;
 ;白名单用户