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

email.ini

@@ -5,7 +5,6 @@
 to_email                = api@yidian-inc.com
 
 [dev-tcc : common]
-to_email                = zhangyu1@yidian-inc.com
 
 [test-tcc : common]
-to_email                = zhangyu1@yidian-inc.com
+to_email                = wanjilong@yidian-inc.com
\ No newline at end of file

mysql.ini

@@ -239,7 +239,7 @@ tccIndex.connect_timeout=2
 tccIndex.username='bp_rw'
 tccIndex.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 tccIndex.charset='utf8mb4'
-tccIndex.write.host='w.bp_test_mysql5.int.yidian-inc.com:3310,w.bp_test_mysql5.int.yidian-inc.com:3310'
+tccIndex.write.host='w.bp_test_mysql5.int.yidian-inc.com:3310'
 tccIndex.read.host[]='r.bp_test_mysql5_1.int.yidian-inc.com:3310,r.bp_test_mysql5_1.int.yidian-inc.com:3310'
 tccIndex.read.host[]='r.bp_test_mysql5_2.int.yidian-inc.com:3310,r.bp_test_mysql5_2.int.yidian-inc.com:3310'
 
@@ -267,6 +267,19 @@ commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
 commerce.charset='utf8mb4'
 commerce.write.host='dbproxy.local.cutt.com:5101'
 commerce.read.host='dbproxy.local.cutt.com:5101'
+
+
+; 生活号 接龙拼单 用户信息
+zhiyue.database_type='mysql'
+zhiyue.database_name='zhiyue'
+zhiyue.connect_timeout=2
+zhiyue.username='zhiyue_ro'
+zhiyue.password='s5JEh#FUvX%7P3sO9ZDQw&cpH$Xr8Q'
+zhiyue.charset='utf8mb4'
+zhiyue.write.host='10.9.110.120:4066'
+zhiyue.read.host='10.9.110.120:4066'
+
+
 ; 预发环境
 [perf-order : prod-order : order : common]
 
@@ -288,9 +301,20 @@ commerce.connect_timeout=2
 commerce.username='commerce_rw'
 commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
 commerce.charset='utf8mb4'
-commerce.write.host='dbproxy.local.cutt.com:5101'
-commerce.read.host='dbproxy.local.cutt.com:5101'
- 
+commerce.write.host='10.9.155.216:4066'
+commerce.read.host='10.9.155.216:4066'
+
+
+; 生活号 接龙拼单 用户信息
+zhiyue.database_type='mysql'
+zhiyue.database_name='zhiyue'
+zhiyue.connect_timeout=2
+zhiyue.username='zhiyue_ro'
+zhiyue.password='s5JEh#FUvX%7P3sO9ZDQw&cpH$Xr8Q'
+zhiyue.charset='utf8mb4'
+zhiyue.write.host='10.9.110.120:4066'
+zhiyue.read.host='10.9.110.120:4066'
+
 ; 开发联调测试
 [dev-order : order : common]
 order.database_type='mysql'
@@ -307,12 +331,26 @@ order.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.i
 commerce.database_type='mysql'
 commerce.database_name='commerce'
 commerce.connect_timeout=2
-commerce.username='commerce_rw'
-commerce.password='zhd8IJZdpAgxyvc6EVPP3VG8'
+commerce.username='shq_rw'
+commerce.password='@Z0#ylCRgPKx4v1bjqH5#mNP%9UO7t'
 commerce.charset='utf8mb4'
-commerce.write.host='dbproxy.local.cutt.com:5101'
-commerce.read.host='dbproxy.local.cutt.com:5101'
- 
+commerce.write.host='10.126.154.178:3306'
+commerce.read.host='10.126.154.178:3306'
+
+
+
+; 生活号 接龙拼单 用户信息
+zhiyue.database_type='mysql'
+zhiyue.database_name='zhiyue'
+zhiyue.connect_timeout=2
+zhiyue.username='zhiyue_ro'
+zhiyue.password='s5JEh#FUvX%7P3sO9ZDQw&cpH$Xr8Q'
+zhiyue.charset='utf8mb4'
+zhiyue.write.host='10.9.110.120:4066'
+zhiyue.read.host='10.9.110.120:4066'
+
+
+
 
 [pay : common]
 
@@ -430,3 +468,41 @@ wallet.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 wallet.charset='utf8mb4'
 wallet.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 wallet.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+[coupon : common]
+
+; 生产环境
+[prod-coupon : coupon : common]
+wallet.database_type='mysql'
+wallet.database_name='coupon'
+wallet.connect_timeout=2
+wallet.username=''
+wallet.password=''
+wallet.charset='utf8mb4'
+wallet.write.host=''
+wallet.read.host=''
+
+; 预发环境
+[perf-coupon : prod-coupon : wallet : common]
+
+; 测试环境
+[test-coupon : coupon : common]
+wallet.database_type='mysql'
+wallet.database_name='coupon'
+wallet.connect_timeout=2
+wallet.username='bp_rw'
+wallet.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+wallet.charset='utf8mb4'
+wallet.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+wallet.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 联调环境
+[dev-coupon : coupon : common]
+wallet.database_type='mysql'
+wallet.database_name='coupon'
+wallet.connect_timeout=2
+wallet.username='bp_rw'
+wallet.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
+wallet.charset='utf8mb4'
+wallet.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+wallet.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'

redis.ini

@@ -141,3 +141,30 @@ cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-order : test-order : order : common]
 
+
+[coupon : common]
+
+[prod-coupon : coupon : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18136/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='igbinary'
+cacheConnect.prefix=''
+
+
+[perf-order : coupon : common]
+[test-order : coupon : 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='igbinary'
+cacheConnect.prefix=''
+[dev-coupon : test-coupon : coupon : common]
+

wallet.ini

@@ -8,22 +8,28 @@ withdraw.day_total_amount = 100000;
 ;Ping++轮训条数
 withdraw.pinpp_sync_limit = 100;
 ;提现审核阈值，超过进审核列表 单位 分
-withdraw.withdraw_apply_amount = 3000;
+withdraw.withdraw_apply_amount = 500;
 ;关闭提现
 withdraw.is_closed = 1;
 [prod-wallet : common]
 ;生产的pingpp key
-withdraw.pingpp_appid = 'app_i58a94Pq1qfDDK4q';
+;新版C端提现appid
+withdraw.new_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
+;旧版C端提现appid
+withdraw.old_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
 
 [test-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
 withdraw.defer_day = 7;
 ;每日提现次数
-withdraw.day_count_limit = 2;
+withdraw.day_count_limit = 20;
 ;每日提现最大限额 单位：分
 withdraw.day_total_amount = 100000;
 ;测试的pingpp key
-withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;生活圈-测试-c端-新版本-提现
+withdraw.new_pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;生活圈-测试-c端-老版本-提现
+withdraw.old_pingpp_appid = 'app_GirTKSbHG088SCqj';
 ;关闭提现
 withdraw.is_closed = 0;
 

xhprof.ini

@@ -4,3 +4,4 @@ collection.bp_test_go2yd_com = 1
 
 #是否开启xhprof, 按照域名来开启， 值为开启的百分比
 switch.bp_test_go2yd_com = 100
+switch.bp_go2yd_com = 100
\ No newline at end of file