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

mysql.ini

@@ -139,6 +139,7 @@ marketing.charset='utf8mb4'
 marketing.write.host='w.bp_marketing.int.yidian-inc.com:3306'
 marketing.read.host='r.bp_marketing_1.int.yidian-inc.com:3306,r.bp_marketing_2.int.yidian-inc.com:3306'
 
+
 ; 预发环境
 [perf-goods : prod-goods : goods : common]
 
@@ -162,6 +163,8 @@ marketing.charset='utf8mb4'
 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 : goods : common]
 goods.database_type='mysql'
@@ -184,6 +187,7 @@ marketing.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1
 
 
 
+
 ;TCC使用分片
 [tcc : common]
 
@@ -224,6 +228,15 @@ order.charset='utf8mb4'
 order.write.host='w.bp_order.int.yidian-inc.com:3306'
 order.read.host='r.bp_order_1.int.yidian-inc.com:3306,r.bp_order_2.int.yidian-inc.com:3306'
 
+; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @2021-7-21 待生活号重构完毕后会删除该配置
+commerce.database_type='mysql'
+commerce.database_name='commerce'
+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'
 ; 预发环境
 [perf-order : prod-order : order : common]
 
@@ -238,6 +251,16 @@ 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'
 
+; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @2021-7-21 待生活号重构完毕后会删除该配置
+commerce.database_type='mysql'
+commerce.database_name='commerce'
+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'
+ 
 ; 开发联调测试
 [dev-order : order : common]
 order.database_type='mysql'
@@ -250,6 +273,16 @@ 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'
 
 
+; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @2021-7-21 待生活号重构完毕后会删除该配置
+commerce.database_type='mysql'
+commerce.database_name='commerce'
+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'
+ 
 
 [pay : common]
 

redis.ini

@@ -9,7 +9,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
  
 
@@ -22,7 +22,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-gateway : test-gateway : gateway : common]
 
@@ -41,7 +41,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 countConnect.mode='codis'
@@ -64,7 +64,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
@@ -98,7 +98,7 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
  
 
@@ -111,6 +111,33 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='none'
+cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-goods : test-goods : goods : common]
+
+[order : common]
+
+[prod-order : order : 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 : order : common]
+[test-order : order : 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-order : test-order : order : common]
+