Merge branch 'master' into chicken_v1

dictionary.ini

@@ -5,6 +5,9 @@
 104="平台营销补贴"
 105="团长佣金收入"
 106="平台活动补贴"
+107="第三方渠道手续费"
+108="结算价收益"
+109="结算价补贴"
 201="余额提现"
 301="平台营销补贴"
 302="商品交易"

kafka.ini

@@ -10,8 +10,15 @@
 ;商户项目继承common + 自己的配置，此节中配置会覆盖父级的相同配置（不区分环境）
 [merchant : common]
 [prod-merchant : merchant : common]
+account.broker_list='l-kafka-outer1.ops.hj1.yidian-inc.com:9092,l-kafka-outer2.ops.hj1.yidian-inc.com:9092,l-kafka-outer3.ops.hj1.yidian-inc.com:9092,l-kafka-outer4.ops.hj1.yidian-inc.com:9092,l-kafka-outer5.ops.hj1.yidian-inc.com:9092'
+account.topic='bp_create_account_prod'
+
 [perf-merchant : prod-merchant : merchant : common]
+
 [test-merchant : prod-merchant : merchant : common]
+account.broker_list='l-kafka-test-env1.ops.hj1.yidian-inc.com:9092'
+account.topic='bp_create_account_test'
+
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
 
 ;触达项目
@@ -77,4 +84,15 @@ goods.publish.topic='bp_str_jielong_goods_publish_dev'
 [prod-wallet : wallet : common]
 [perf-wallet : wallet : common]
 [test-wallet : wallet : common]
-[dev-wallet : test-wallet : wallet : common]
+[dev-wallet : test-wallet : wallet : common]
\ No newline at end of file
+
+;account项目
+[account : common]
+[prod-account : account : common]
+account.broker_list='l-kafka-outer1.ops.hj1.yidian-inc.com:9092,l-kafka-outer2.ops.hj1.yidian-inc.com:9092,l-kafka-outer3.ops.hj1.yidian-inc.com:9092,l-kafka-outer4.ops.hj1.yidian-inc.com:9092,l-kafka-outer5.ops.hj1.yidian-inc.com:9092'
+account.topic='bp_create_account_prod'
+[perf-account : prod-account : account : common]
+[test-account : account : common]
+account.broker_list='l-kafka-test-env1.ops.hj1.yidian-inc.com:9092,l-kafka-test-env2.ops.hj1.yidian-inc.com:9092,l-kafka-test-env3.ops.hj1.yidian-inc.com:9092'
+account.topic='bp_create_account_test'
+[dev-account : test-account : account : common]
\ No newline at end of file

wallet.ini

@@ -16,8 +16,8 @@ withdraw.whitelist = ',510234788199,510227177373,510233204694,510239348329,';
 ;兼容老钱包提现，发消息的验签
 withdraw.old_sign = '9e41321e688048d289678dba73be8a28';
 ;转账服务调用方id和秘钥
-transfer.transfer_service_id='21091014290202205007';
-transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
+transfer.transfer_service_id = '21091014290202205007';
+transfer.transfer_service_secret = '33ce7043920123145c998e979637a3b1';
 
 [prod-wallet : common]
 ;生产的pingpp key
@@ -25,9 +25,11 @@ transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
 withdraw.new_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
 ;生活圈-线上-c端app-老版-提现
 withdraw.old_pingpp_appid = 'app_HGej90rbPiXTHmf5';
+;燕郊圈-线上-c端app-新版-提现
+withdraw.yanjiaoquan_pingpp_appid = 'app_GirTKSbHG088SCqj';
 ;转账服务调用方id和秘钥
-transfer.transfer_service_id='21091014290202205007';
-transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
+transfer.transfer_service_id = '21091014290202205007';
+transfer.transfer_service_secret = '33ce7043920123145c998e979637a3b1';
 
 [perf-wallet : common]
 ;生产的pingpp key
@@ -35,9 +37,11 @@ transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
 withdraw.new_pingpp_appid = 'app_f5O4aDrvXvXTiffb';
 ;生活圈-线上-c端app-老版-提现
 withdraw.old_pingpp_appid = 'app_HGej90rbPiXTHmf5';
+;燕郊圈-线上-c端app-新版-提现
+withdraw.yanjiaoquan_pingpp_appid = 'app_GirTKSbHG088SCqj';
 ;转账服务调用方id和秘钥
-transfer.transfer_service_id='21091014290202205007';
-transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
+transfer.transfer_service_id = '21091014290202205007';
+transfer.transfer_service_secret = '33ce7043920123145c998e979637a3b1';
 
 [test-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
@@ -51,11 +55,13 @@ withdraw.day_total_amount = 100000;
 withdraw.new_pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
 ;生活圈-测试-c端-老版本-提现
 withdraw.old_pingpp_appid = 'app_GirTKSbHG088SCqj';
+;燕郊圈-线上-c端app-新版-提现
+withdraw.yanjiaoquan_pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
 ;关闭提现
 withdraw.is_closed = 0;
 ;转账服务调用方id和秘钥
-transfer.transfer_service_id='21091011380404205008';
-transfer.transfer_service_secret='7a9afab08309ab59ee395703d58cb00c';
+transfer.transfer_service_id = '21091011380404205008';
+transfer.transfer_service_secret = '7a9afab08309ab59ee395703d58cb00c';
 
 [dev-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
@@ -69,8 +75,10 @@ withdraw.day_total_amount = 100000;
 withdraw.new_pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
 ;生活圈-测试-c端-老版本-提现
 withdraw.old_pingpp_appid = 'app_GirTKSbHG088SCqj';
+;燕郊圈-线上-c端app-新版-提现
+withdraw.yanjiaoquan_pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
 ;关闭提现
 withdraw.is_closed = 0;
 ;转账服务调用方id和秘钥
-transfer.transfer_service_id='21091011280606205005';
-transfer.transfer_service_secret='6aa0c9a562426275940267e035fd769d';
+transfer.transfer_service_id = '21091011280606205005';
+transfer.transfer_service_secret = '6aa0c9a562426275940267e035fd769d';
\ No newline at end of file