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

kafka.ini

+[common]
+
+[gateway : common]
+[prod-gateway : gateway : common]
+[perf-gateway : gateway : common]
+[test-gateway : gateway : common]
+[dev-gateway : test-gateway : gateway : common]
+
+;商户项目配置
+;商户项目继承common + 自己的配置，此节中配置会覆盖父级的相同配置（不区分环境）
+[merchant : common]
+[prod-merchant : merchant : common]
+[perf-merchant : prod-merchant : merchant : common]
+[test-merchant : prod-merchant : merchant : common]
+[dev-merchant : test-merchant : prod-merchant : merchant : common]
+
+;触达项目
+[interaction : common]
+
+[prod-interaction : interaction : common]
+subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+subscribe.topic='bp_str_jielong_subscribe_notify_prod'
+
+[perf-interaction : prod-interaction : interaction : common]
+
+[test-interaction : interaction : common]
+subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+subscribe.topic='bp_str_jielong_subscribe_notify_test'
+
+[dev-interaction : test-interaction : interaction : common]
+subscribe.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+subscribe.topic='bp_str_jielong_subscribe_notify_dev'
+
+;商品项目
+[goods : common]
+
+[prod-goods : goods : common]
+goods.publish.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+goods.publish.topic='bp_str_jielong_goods_publish_prod'
+
+[perf-goods : prod-goods : goods : common]
+
+[test-goods : goods : common]
+goods.publish.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+goods.publish.topic='bp_str_jielong_goods_publish_test'
+
+[dev-goods : test-goods : goods : common]
+goods.publish.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
+goods.publish.topic='bp_str_jielong_goods_publish_dev'
+
+
+;订单项目
+[order : common]
+[prod-order : order : common]
+[perf-order : order : common]
+[test-order : order : common]
+[dev-order : test-order : order : common]
+
+;优惠券项目
+[coupon : common]
+[prod-coupon : coupon : common]
+[perf-order : coupon : common]
+[test-order : coupon : common]
+[dev-coupon : test-coupon : coupon : common]
+
+;钱包项目
+[wallet : common]
+[prod-wallet : wallet : common]
+[perf-wallet : wallet : common]
+[test-wallet : wallet : common]
+[dev-wallet : test-wallet : wallet : common]
\ No newline at end of file

wallet.ini

@@ -23,6 +23,13 @@ withdraw.new_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
 ;生活圈-线上-c端app-老版-提现
 withdraw.old_pingpp_appid = 'app_HGej90rbPiXTHmf5';
 
+[perf-wallet : common]
+;生产的pingpp key
+;新版C端提现appid
+withdraw.new_pingpp_appid = 'app_f5O4aDrvXvXTiffb';
+;生活圈-线上-c端app-老版-提现
+withdraw.old_pingpp_appid = 'app_HGej90rbPiXTHmf5';
+
 [test-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
 withdraw.defer_day = 7;