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

dictionary

-[trade_type]

dictionary.ini

+[trade_type]
+101="平台抽成"
+102="商品交易"
+103="商户营销补贴"
+104="平台营销补贴"
+105="团长佣金收入"
+106="平台活动补贴"
+201="余额提现"
+301="平台营销补贴"
+302="商品交易"
+303="商品营销补贴"
+304="第三方渠道手续费"
+305="团长佣金收入"
+401="平台营销补贴"
+402="平台活动补贴"
+403="商户营销补贴"
+404="团长佣金收入"
+405="平台抽成"
+406="第三方渠道手续费"
+407="商品交易"
+501="平台营销充值"
+502="商户营销充值"

elasticsearch.ini

@@ -5,9 +5,13 @@
 
 ; 生产环境
 [prod-goods : goods : common]
+goods.host="http://10.138.7.40:40000,http://10.138.7.41:40000,http://10.138.7.42:40000"
+
 
 ; 预发环境
 [perf-goods : prod-goods : goods : common]
+goods.host="http://10.138.7.40:40000,http://10.138.7.41:40000,http://10.138.7.42:40000"
+
 
 ；测试测试
 [test-goods : prod-goods : goods : common]

mysql.ini

@@ -79,25 +79,51 @@ interaction.charset='utf8mb4'
 interaction.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 interaction.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
+merchant.database_type='mysql'
+merchant.database_name='merchant'
+merchant.connect_timeout=2
+merchant.username='bp_test_rw'
+merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+merchant.charset='utf8mb4'
+merchant.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
 
 [goods : common]
 
 ; 生产环境
 [prod-goods : goods : common]
+goods.database_type='mysql'
+goods.database_name='goods'
+goods.connect_timeout=2
+goods.username='bp_goods_rw'
+goods.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+goods.charset='utf8mb4'
+goods.write.host='w.bp_goods.int.yidian-inc.com:3306'
+goods.read.host='r.bp_goods_1.int.yidian-inc.com:3306,r.bp_goods_2.int.yidian-inc.com:3306'
+
+marketing.database_type='mysql'
+marketing.database_name='marketing'
+marketing.connect_timeout=2
+marketing.username='bp_goods_rw'
+marketing.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+marketing.charset='utf8mb4'
+marketing.write.host='w.bp_goods.int.yidian-inc.com:3306'
+marketing.read.host='r.bp_goods_1.int.yidian-inc.com:3306,r.bp_goods_2.int.yidian-inc.com:3306'
 
 ; 预发环境
-[perf-goods : prod-goods : merchant : common]
+[perf-goods : prod-goods : goods : common]
 
 ; 测试环境
-[test-goods : merchant : common]
+[test-goods : goods : common]
 goods.database_type='mysql'
 goods.database_name='goods'
 goods.connect_timeout=2
 goods.username='bp_rw'
 goods.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 goods.charset='utf8mb4'
-goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
-goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+goods.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+goods.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 marketing.database_type='mysql'
 marketing.database_name='marketing'
@@ -105,11 +131,11 @@ marketing.connect_timeout=2
 marketing.username='bp_rw'
 marketing.password='OA2My1X9tDUiTymO4yq4VAXCM4ttXj'
 marketing.charset='utf8mb4'
-marketing.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
-marketing.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+marketing.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+marketing.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 开发联调测试
-[dev-goods : merchant : common]
+[dev-goods : goods : common]
 goods.database_type='mysql'
 goods.database_name='goods'
 goods.connect_timeout=2

pay.ini

+[common]
+;支付订单有效时长
+pay.expire_time         = 1800;
+pay.wechat_rate         = 60;
+pay.wechat_account_id   = 10010;