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

bizcode.ini

+[prefix]
+gateway=1000000
+merchant=2000000
+interaction=3000000
+goods=4000000
+order=5000000
+pay=6000000
\ No newline at end of file

elasticsearch.ini

+; 公共的配置内容，不区分应用及环境
+[common]
+
+[goods : common]
+
+; 生产环境
+[prod-goods : goods : common]
+
+; 预发环境
+[perf-goods : prod-goods : goods : common]
+
+；测试测试
+[test-goods : prod-goods : goods : common]
+goods.host="http://10.126.154.152:40000"
+
+；开发联调测试
+[dev-goods : prod-goods : goods : common]
+goods.host="http://10.126.154.152:40000"
\ No newline at end of file

mongo.ini

@@ -7,6 +7,31 @@
 
 ;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
 [prod-gateway : gateway : common]
+gateway.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+gateway.uriOptions.username='rs_merchant_rw'
+gateway.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
+gateway.uriOptions.replicaSet='rs_bp'
+gateway.uriOptions.readPreference='secondaryPreferred'
+gateway.uriOptions.connectTimeoutMS=500
+gateway.uriOptions.socketTimeoutMS=6000
+gateway.uriOptions.w=1
+gateway.uriOptions.wTimeoutMS=3000
+gateway.driverOptions.typeMap.root='array'
+gateway.driverOptions.typeMap.document='array'
+ 
+
+xhprof.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+xhprof.uriOptions.username='rs_merchant_rw'
+xhprof.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
+xhprof.uriOptions.replicaSet='rs_bp'
+xhprof.uriOptions.readPreference='secondaryPreferred'
+xhprof.uriOptions.connectTimeoutMS=500
+xhprof.uriOptions.socketTimeoutMS=6000
+xhprof.uriOptions.w=1
+xhprof.uriOptions.wTimeoutMS=3000
+xhprof.driverOptions.typeMap.root='array'
+xhprof.driverOptions.typeMap.document='array'
+
 
 ;商户项目继承common + 自己的配置 + 测试环境特有有配置，此节中配置会覆盖父级的相同配置
 [perf-gateway : prod-gateway : gateway : common]

mysql.ini

@@ -6,15 +6,24 @@
 
 ; 生产环境
 [prod-merchant : merchant : common]
+merchant.database_type='mysql'
+merchant.database_name='merchant'
+merchant.connect_timeout=2
+merchant.username='bp_merchant_rw'
+merchant.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+merchant.charset='utf8mb4'
+merchant.write.host='w.bp_merchant.int.yidian-inc.com:3306'
+merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.yidian-inc.com:3306'
+
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
 
 ; 测试环境
-[test-merchant : prod-merchant : merchant : common]
+[test-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
-merchant.connect_timeout=10
+merchant.connect_timeout=2
 merchant.username='bp_test_rw'
 merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 merchant.charset='utf8mb4'
@@ -22,37 +31,55 @@ merchant.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
 merchant.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 联调环境
-[dev-merchant : prod-merchant : merchant : common]
+[dev-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
-merchant.connect_timeout=10
+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'
 
+
+
+
+[interaction : common]
+; 生产环境
+[prod-interaction : interaction : common]
+interaction.database_type='mysql'
+interaction.database_name='interaction'
+interaction.connect_timeout=2
+interaction.username='bp_interaction_rw'
+interaction.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+interaction.charset='utf8mb4'
+interaction.write.host='w.bp_interaction.int.yidian-inc.com:3306'
+interaction.read.host='r.bp_interaction_1.int.yidian-inc.com:3306,r.bp_interaction_2.int.yidian-inc.com:3306'
+
+; 预发环境
+[perf-merchant : prod-merchant : merchant : common]
+
 ; 测试环境
-[test-interaction : prod-interaction : interaction : common]
-merchant.database_type='mysql'
-merchant.database_name='interaction'
-merchant.connect_timeout=10
-merchant.username='bp_test_rw'
-merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
-merchant.charset='utf8mb4'
-merchant.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
-merchant.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+[test-interaction : interaction : common]
+interaction.database_type='mysql'
+interaction.database_name='interaction'
+interaction.connect_timeout=2
+interaction.username='bp_test_rw'
+interaction.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+interaction.charset='utf8mb4'
+interaction.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+interaction.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 联调环境
-[dev-interaction : prod-interaction : interaction : common]
-merchant.database_type='mysql'
-merchant.database_name='interaction'
-merchant.connect_timeout=10
-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'
+[dev-interaction : interaction : common]
+interaction.database_type='mysql'
+interaction.database_name='interaction'
+interaction.connect_timeout=2
+interaction.username='bp_test_rw'
+interaction.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+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'
 
 
 [goods : common]
@@ -63,13 +90,89 @@ merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_
 ; 预发环境
 [perf-goods : prod-goods : merchant : common]
 
-；开发联调测试
-[dev-goods : prod-goods : merchant : common]
+; 测试环境
+[test-goods : merchant : common]
+goods.database_type='mysql'
+goods.database_name='goods'
+goods.connect_timeout=2
+goods.username='bp_test_rw'
+goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+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'
+
+marketing.database_type='mysql'
+marketing.database_name='marketing'
+marketing.connect_timeout=2
+marketing.username='bp_test_rw'
+marketing.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+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'
+
+; 开发联调测试
+[dev-goods : merchant : common]
 goods.database_type='mysql'
 goods.database_name='goods'
-goods.connect_timeout=10
+goods.connect_timeout=2
 goods.username='bp_test_rw'
 goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
 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'
+
+marketing.database_type='mysql'
+marketing.database_name='marketing'
+marketing.connect_timeout=2
+marketing.username='bp_test_rw'
+marketing.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+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'
+
+[tcc : common]
+
+[prod-tcc : tcc : common]
+
+[dev-tcc : prod-tcc : tcc : common]
+tccIndex.database_type='mysql'
+tccIndex.database_name='bp_tcc'
+tccIndex.connect_timeout=2
+tccIndex.username='bp_test_rw'
+tccIndex.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+tccIndex.charset='utf8'
+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'
+tccIndex.read.host[]='r.bp_test_mysql5_2.int.yidian-inc.com:3310'
+
+[test-tcc : dev-tcc]
+
+
+[order : common]
+; 生产环境
+[prod-order : order : common]
+
+; 预发环境
+[perf-order : prod-order : order : common]
+
+; 测试环境
+[test-order : order : common]
+order.database_type='mysql'
+order.database_name='order'
+order.connect_timeout=2
+order.username='bp_test_rw'
+order.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+order.charset='utf8mb4'
+order.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+order.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 开发联调测试
+[dev-order : order : common]
+order.database_type='mysql'
+order.database_name='order'
+order.connect_timeout=2
+order.username='bp_test_rw'
+order.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+order.charset='utf8mb4'
+order.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+order.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'

redis.ini

@@ -3,6 +3,16 @@
 [gateway : common]
 
 [prod-gateway : gateway : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18134/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+ 
+
 [perf-gateway : gateway : common]
 [test-gateway : gateway : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
@@ -25,6 +35,24 @@ cacheConnect.prefix=''
 
 ;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
 [prod-merchant : merchant : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18135/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18138/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 
 ;商户项目继承common + 自己的配置 + 测试环境特有有配置，此节中配置会覆盖父级的相同配置
 [perf-merchant : prod-merchant : merchant : common]
@@ -41,4 +69,48 @@ cacheConnect.prefix=''
 
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
 
+[test-interaction : test-merchant : prod-merchant : merchant : common]
+
 [dev-interaction : test-merchant : prod-merchant : merchant : common]
+
+[prod-interaction : prod-merchant : merchant : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18139/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+
+[pref-interaction : prod-interaction : prod-merchant : merchant : common]
+
+
+
+
+
+[goods : common]
+
+[prod-goods : goods : 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='none'
+cacheConnect.prefix=''
+ 
+
+[perf-goods : goods : common]
+[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.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+[dev-goods : test-goods : goods : common]

xhprof.ini

 [common]
-gateway.host="rs_bp_test_01.int.yidian-inc.com:27018,rs_bp_test_02.int.yidian-inc.com:27018,rs_bp_test_03.int.yidian-inc.com:27018"
-gateway.uriOptions.username='rs_bp_test_rw'
-gateway.uriOptions.password='uE5bLz9#GSHXzhuaAeTDqll65mM@XC'
-gateway.uriOptions.replicaSet='rs_bp_test'
-gateway.uriOptions.readPreference='secondaryPreferred'
-gateway.uriOptions.connectTimeoutMS=500
-gateway.uriOptions.socketTimeoutMS=6000
-gateway.uriOptions.w=1
-gateway.uriOptions.wTimeoutMS=3000
-gateway.driverOptions.typeMap.root='array'
-gateway.driverOptions.typeMap.document='array'
\ No newline at end of file
+# 对应的域名是否使用当前域名作为 collection 1：开启，0:不开启
+collection.bp_test_go2yd_com = 1
+
+#是否开启xhprof, 按照域名来开启， 值为开启的百分比
+switch.bp_test_go2yd_com = 100