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

redis.ini

@@ -17,7 +17,7 @@ cacheConnect.prefix=''
 [test-gateway : gateway : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
-cacheConnect.topom='http://10.126.165.6:18080/topom'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
 cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
@@ -59,7 +59,7 @@ countConnect.prefix=''
 [test-merchant : prod-merchant : merchant : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
-cacheConnect.topom='http://10.126.165.6:18080/topom'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
 cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
@@ -106,7 +106,7 @@ cacheConnect.prefix=''
 [test-goods : goods : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
-cacheConnect.topom='http://10.126.165.6:18080/topom'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
 cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0

wallet.ini

@@ -24,6 +24,8 @@ withdraw.day_count_limit = 2;
 withdraw.day_total_amount = 100000;
 ;测试的pingpp key
 withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;关闭提现
+withdraw.is_closed = 0;
 
 [dev-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
@@ -33,4 +35,6 @@ withdraw.day_count_limit = 2;
 ;每日提现最大限额 单位：分
 withdraw.day_total_amount = 100000;
 ;测试的pingpp key
-withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
\ No newline at end of file
+withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;关闭提现
+withdraw.is_closed = 0;
\ No newline at end of file