feature 生活圈 ： 排线功能从goods迁移到order

interface.ini

@@ -174,11 +174,7 @@ goods.tcc.place_an_order_cancel = "http://goods.int.yidian-inc.com/tcc/tcc/place
 goods.tcc.cancel_order_try = "http://goods.int.yidian-inc.com/tcc/tcc/cancel_order_try"
 goods.tcc.cancel_order_confirm = "http://goods.int.yidian-inc.com/tcc/tcc/cancel_order_confirm"
 goods.tcc.cancel_order_cancel = "http://goods.int.yidian-inc.com/tcc/tcc/cancel_order_cancel"
-;deliver 骑手
-goods.deliverer.add_deliverer = "http://goods.int.yidian-inc.com/merchant/deliverer/add_deliverer"
-goods.deliverer.list_day_deliverer = "http://goods.int.yidian-inc.com/merchant/deliverer/list_day_deliverer"
-goods.deliverer.save_day_deliverer = "http://goods.int.yidian-inc.com/merchant/deliverer/save_day_deliverer"
-goods.deliverer.list_day_deliverer_conf = "http://goods.int.yidian-inc.com/merchant/deliverer/list_day_deliverer_conf"
+
 
 ;======================= 5000000-prod order微服务接口 ======================= 
 ;订单
@@ -206,7 +202,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"
@@ -410,11 +410,7 @@ goods.tcc.cancel_order_try = "http://goods.test.int.yidian-inc.com/tcc/tcc/cance
 goods.tcc.cancel_order_confirm = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_confirm"
 goods.tcc.cancel_order_cancel = "http://goods.test.int.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
-;deliver 骑手
-goods.deliverer.add_deliverer = "http://goods.test.int.yidian-inc.com/merchant/deliverer/add_deliverer"
-goods.deliverer.list_day_deliverer = "http://goods.test.int.yidian-inc.com/merchant/deliverer/list_day_deliverer"
-goods.deliverer.save_day_deliverer = "http://goods.test.int.yidian-inc.com/merchant/deliverer/save_day_deliverer"
-goods.deliverer.list_day_deliverer_conf = "http://goods.test.int.yidian-inc.com/merchant/deliverer/list_day_deliverer_conf"
+
 
 ;======================= 5000000-test order微服务接口 ======================= 
 ;订单
@@ -442,6 +438,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"
@@ -610,11 +611,7 @@ goods.tcc.cancel_order_try = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_ord
 goods.tcc.cancel_order_confirm = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_confirm"
 goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_order_cancel"
 
-;deliver 骑手
-goods.deliverer.add_deliverer = "http://goods.dev.yidian-inc.com/merchant/deliverer/add_deliverer"
-goods.deliverer.list_day_deliverer = "http://goods.dev.yidian-inc.com/merchant/deliverer/list_day_deliverer"
-goods.deliverer.save_day_deliverer = "http://goods.dev.yidian-inc.com/merchant/deliverer/save_day_deliverer"
-goods.deliverer.list_day_deliverer_conf = "http://goods.dev.yidian-inc.com/merchant/deliverer/list_day_deliverer_conf"
+
 
 ;======================= 5000000-dev order微服务接口 ======================= 
 ;订单
@@ -642,7 +639,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,15 +139,6 @@ 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'
 
-; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @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-goods : prod-goods : goods : common]
@@ -172,15 +163,7 @@ 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'
 
-; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @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-goods : goods : common]
@@ -202,15 +185,7 @@ 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'
 
-; 生活号 接龙拼单 骑手排线功能开发 @耿鸿飞 @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'
+
 
 
 ;TCC使用分片
@@ -253,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]
 
@@ -267,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'
@@ -278,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]