Commit 02be649c authored by 卢洪光's avatar 卢洪光

Merge branch 'feature-deliver210913' into 'master'

Feature deliver210913

See merge request bp/yaconf!58
parents 6011d2f7 f2f299cc
......@@ -345,6 +345,23 @@ order.deliverer.list_day_deliverer_conf = "http://order.int.yidian-inc.com/deliv
order.deliverer.plan_down = "http://order.int.yidian-inc.com/deliverer/deliverer/plan_down"
order.deliverer.build_plan = "http://order.int.yidian-inc.com/deliverer/deliverer/build_plan"
order.deliverer.plan_down_log = "http://order.int.yidian-inc.com/deliverer/deliverer/plan_down_log"
order.deliverer.activate_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/activate_deliverer";激活骑手
order.deliverer.list_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/list_deliverer";骑手列表
order.deliverer.forbidden_deliverer = "http://order.int.yidian-inc.com/deliverer/deliverer/forbidden_deliverer";禁用或者启用骑手
order.deliverer.jobs.give_app = "http://order.int.yidian-inc.com/deliverer/jobs/give_app";小程序送餐任务
order.deliverer.jobs.give_detail_app = "http://order.int.yidian-inc.com/deliverer/jobs/give_detail_app";小程序送餐任务详情
order.deliverer.jobs.take_app = "http://order.int.yidian-inc.com/deliverer/jobs/take_app";小程序取餐任务
order.deliverer.jobs.take_user_admin = "http://order.int.yidian-inc.com/deliverer/jobs/take_user_admin";管理后台骑手取餐任务列表
order.deliverer.jobs.give_user_admin = "http://order.int.yidian-inc.com/deliverer/jobs/give_user_admin";管理后台骑手送餐餐任务列表
order.deliverer.jobs.activity_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_admin";管理后台活动任务列表
order.deliverer.jobs.activity_user_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_user_admin";管理后台活动骑手任务列表
order.deliverer.jobs.activity_user_change_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_user_change_admin";管理后台活动骑手任务调整
order.deliverer.jobs.activity_publish_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_publish_admin";下发任务
order.deliverer.jobs.activity_build_admin = "http://order.int.yidian-inc.com/deliverer/jobs/activity_build_admin";生成配送任务
;======================= 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"
......@@ -752,6 +769,21 @@ order.deliverer.plan_down = "http://order.pre.int.yidian-inc.com/deliverer/deliv
order.deliverer.build_plan = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/build_plan"
order.deliverer.plan_down_log = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/plan_down_log"
order.deliverer.activate_deliverer = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/activate_deliverer";激活骑手
order.deliverer.list_deliverer = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/list_deliverer";骑手列表
order.deliverer.forbidden_deliverer = "http://order.pre.int.yidian-inc.com/deliverer/deliverer/forbidden_deliverer";禁用或者启用骑手
order.deliverer.jobs.give_app = "http://order.pre.int.yidian-inc.com/deliverer/jobs/give_app";小程序送餐任务
order.deliverer.jobs.give_detail_app = "http://order.pre.int.yidian-inc.com/deliverer/jobs/give_detail_app";小程序送餐任务详情
order.deliverer.jobs.take_app = "http://order.pre.int.yidian-inc.com/deliverer/jobs/take_app";小程序取餐任务
order.deliverer.jobs.take_user_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/take_user_admin";管理后台骑手取餐任务列表
order.deliverer.jobs.give_user_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/give_user_admin";管理后台骑手送餐餐任务列表
order.deliverer.jobs.activity_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_admin";管理后台活动任务列表
order.deliverer.jobs.activity_user_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_user_admin";管理后台活动骑手任务列表
order.deliverer.jobs.activity_user_change_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_user_change_admin";管理后台活动骑手任务调整
order.deliverer.jobs.activity_publish_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_publish_admin";下发任务
order.deliverer.jobs.activity_build_admin = "http://order.pre.int.yidian-inc.com/deliverer/jobs/activity_build_admin";生成配送任务
;======================= 6000000-pre pay微服务接口 =======================
pay.order.pay = "http://pay.pre.int.yidian-inc.com/pay/order/pay"
pay.order.refund = "http://pay.pre.int.yidian-inc.com/pay/order/refund"
......@@ -1157,6 +1189,22 @@ order.deliverer.list_day_deliverer_conf = "http://order.test.yidian-inc.com/deli
order.deliverer.plan_down = "http://order.test.yidian-inc.com/deliverer/deliverer/plan_down"
order.deliverer.build_plan = "http://order.test.yidian-inc.com/deliverer/deliverer/build_plan"
order.deliverer.plan_down_log = "http://order.test.yidian-inc.com/deliverer/deliverer/plan_down_log"
order.deliverer.activate_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/activate_deliverer";激活骑手
order.deliverer.list_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/list_deliverer";骑手列表
order.deliverer.forbidden_deliverer = "http://order.test.yidian-inc.com/deliverer/deliverer/forbidden_deliverer";禁用或者启用骑手
order.deliverer.jobs.give_app = "http://order.test.yidian-inc.com/deliverer/jobs/give_app";小程序送餐任务
order.deliverer.jobs.give_detail_app = "http://order.test.yidian-inc.com/deliverer/jobs/give_detail_app";小程序送餐任务详情
order.deliverer.jobs.take_app = "http://order.test.yidian-inc.com/deliverer/jobs/take_app";小程序取餐任务
order.deliverer.jobs.take_user_admin = "http://order.test.yidian-inc.com/deliverer/jobs/take_user_admin";管理后台骑手取餐任务列表
order.deliverer.jobs.give_user_admin = "http://order.test.yidian-inc.com/deliverer/jobs/give_user_admin";管理后台骑手送餐餐任务列表
order.deliverer.jobs.activity_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_admin";管理后台活动任务列表
order.deliverer.jobs.activity_user_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_user_admin";管理后台活动骑手任务列表
order.deliverer.jobs.activity_user_change_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_user_change_admin";管理后台活动骑手任务调整
order.deliverer.jobs.activity_publish_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_publish_admin";下发任务
order.deliverer.jobs.activity_build_admin = "http://order.test.yidian-inc.com/deliverer/jobs/activity_build_admin";生成配送任务
;======================= 6000000-test pay微服务接口 =======================
pay.order.pay = "http://pay.test.yidian-inc.com/pay/order/pay"
pay.order.refund = "http://pay.test.yidian-inc.com/pay/order/refund"
......@@ -1524,6 +1572,22 @@ order.deliverer.list_day_deliverer_conf = "http://order.dev.yidian-inc.com/deliv
order.deliverer.plan_down = "http://order.dev.yidian-inc.com/deliverer/deliverer/plan_down"
order.deliverer.build_plan = "http://order.dev.yidian-inc.com/deliverer/deliverer/build_plan"
order.deliverer.plan_down_log = "http://order.dev.yidian-inc.com/deliverer/deliverer/plan_down_log"
order.deliverer.activate_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/activate_deliverer";激活骑手
order.deliverer.list_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/list_deliverer";骑手列表
order.deliverer.forbidden_deliverer = "http://order.dev.yidian-inc.com/deliverer/deliverer/forbidden_deliverer";禁用或者启用骑手
order.deliverer.jobs.give_app = "http://order.dev.yidian-inc.com/deliverer/jobs/give_app";小程序送餐任务
order.deliverer.jobs.give_detail_app = "http://order.dev.yidian-inc.com/deliverer/jobs/give_detail_app";小程序送餐任务详情
order.deliverer.jobs.take_app = "http://order.dev.yidian-inc.com/deliverer/jobs/take_app";小程序取餐任务
order.deliverer.jobs.take_user_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/take_user_admin";管理后台骑手取餐任务列表
order.deliverer.jobs.give_user_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/give_user_admin";管理后台骑手送餐餐任务列表
order.deliverer.jobs.activity_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_admin";管理后台活动任务列表
order.deliverer.jobs.activity_user_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_user_admin";管理后台活动骑手任务列表
order.deliverer.jobs.activity_user_change_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_user_change_admin";管理后台活动骑手任务调整
order.deliverer.jobs.activity_publish_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_publish_admin";下发任务
order.deliverer.jobs.activity_build_admin = "http://order.dev.yidian-inc.com/deliverer/jobs/activity_build_admin";生成配送任务
;======================= 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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment