Merge branch 'feature-cmd-jl-lineplan' into 'master'

feature 生活号 - 骑手排线 1.增加对旧数据的配置；2gatway增加对goods接口的配置

See merge request bp/yaconf!7

interface.ini

@@ -205,7 +205,11 @@ order.tcc.cancel_order_cancel = "http://order.int.yidian-inc.com/tcc/tcc/cancel_
 order.tcc.create_order_main = "http://order.int.yidian-inc.com/tcc/tcc/create_order_main"
 order.tcc.cancel_order_main = "http://order.int.yidian-inc.com/tcc/tcc/cancel_order_main"
 
-
+;deliver 骑手
+order.deliverer.add_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/add_deliverer"
+order.deliverer.list_day_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
+order.deliverer.save_day_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
+order.deliverer.list_day_deliverer_conf = "http://order.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 ;======================= 6000000-prod pay微服务接口 ======================= 
 pay.order.pay = "http://pay.int.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.int.yidian-inc.com/pay/order/refund"
@@ -415,6 +419,7 @@ goods.tcc.cancel_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/c
 goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
 
+
 ;======================= 5000000-test order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
@@ -441,6 +446,11 @@ order.tcc.cancel_order_cancel = "http://order.test.yidian-inc.com/tcc/tcc/cancel
 order.tcc.create_order_main = "http://order.test.yidian-inc.com/tcc/tcc/create_order_main"
 order.tcc.cancel_order_main = "http://order.test.yidian-inc.com/tcc/tcc/cancel_order_main"
 
+;deliver 骑手
+order.deliverer.add_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/add_deliverer"
+order.deliverer.list_day_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
+order.deliverer.save_day_deliverer = "http://order.test.int.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
+order.deliverer.list_day_deliverer_conf = "http://order.test.int.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 
 ;======================= 6000000-test pay微服务接口 ======================= 
 pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
@@ -620,6 +630,7 @@ goods.tcc.cancel_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel
 goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
 
+
 ;======================= 5000000-dev order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
@@ -646,7 +657,11 @@ order.tcc.cancel_order_cancel = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_
 order.tcc.create_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/create_order_main"
 order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_order_main"
 
-
+;deliver 骑手
+order.deliverer.add_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/add_deliverer"
+order.deliverer.list_day_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_day_deliverer"
+order.deliverer.save_day_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/save_day_deliverer"
+order.deliverer.list_day_deliverer_conf = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_day_deliverer_conf"
 ;======================= 6000000-dev pay微服务接口 ======================= 
 pay.order.pay = "http://pay.dev.yidian-inc.com/pay/order/pay"
 pay.order.refund = "http://pay.dev.yidian-inc.com/pay/order/refund"

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,15 @@ 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'
@@ -249,7 +271,15 @@ 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'
 
-
+; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @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

@@ -114,3 +114,30 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 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='none'
+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='none'
+cacheConnect.prefix=''
+[dev-order : test-order : order : common]
+