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

interface.ini

@@ -141,7 +141,7 @@ goods.marketing.marketing_goods_rate = "http://goods.int.yidian-inc.com/marketin
 goods.marketing.get_marketing_goods_list = "http://goods.int.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
 goods.public.get_marketing_list = "http://goods.int.yidian-inc.com/marketing/marketing/get_marketing_list"
 goods.public.get_distributor = "http://goods.int.yidian-inc.com/marketing/distributor/get_distributor"
-
+goods.public.pindan_goods = "http://goods.int.yidian-inc.com/goods/goods/pindan_goods"
 
 
 ;团长
@@ -153,6 +153,19 @@ goods.marketing.distributor = "http://goods.int.yidian-inc.com/marketing/distrib
 goods.marketing.distributor_list = "http://goods.int.yidian-inc.com/marketing/distributor/distributor_list"
 goods.marketing.distributor_code_url = "http://goods.int.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.int.yidian-inc.com/marketing/distributor/is_distributor"
+
+;自提点
+goods.marketing.add_take_place = "http://goods.int.yidian-inc.com/marketing/takeplace/add"
+goods.marketing.take_place_list = "http://goods.int.yidian-inc.com/marketing/takeplace/list"
+goods.marketing.delete_take_place = "http://goods.int.yidian-inc.com/marketing/takeplace/delete"
+goods.marketing.get_bind_take_place_list = "http://goods.int.yidian-inc.com/marketing/takeplace/get_bind_list"
+
+;供应商
+goods.background.add_ota = "http://goods.int.yidian-inc.com/goods/ota/add"
+goods.background.ota_list = "http://goods.int.yidian-inc.com/goods/ota/list"
+goods.background.delete_ota = "http://goods.int.yidian-inc.com/goods/ota/delete"
+goods.background.update_ota = "http://goods.int.yidian-inc.com/goods/ota/update"
+
 ;分享
 goods.wx.appgc = "https://wx.appgc.cn"
 goods.api.jwshq = "http://api.jwshq.cn"
@@ -424,6 +437,19 @@ goods.marketing.distributor = "http://goods.test.int.yidian-inc.com/marketing/di
 goods.marketing.distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_list"
 goods.marketing.distributor_code_url = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/is_distributor"
+
+;自提点
+goods.marketing.add_take_place = "http://goods.test.yidian-inc.com/marketing/takeplace/add"
+goods.marketing.take_place_list = "http://goods.test.yidian-inc.com/marketing/takeplace/list"
+goods.marketing.delete_take_place = "http://goods.test.yidian-inc.com/marketing/takeplace/delete"
+goods.marketing.get_bind_take_place_list = "http://goods.test.yidian-inc.com/marketing/takeplace/get_bind_list"
+
+;供应商
+goods.background.add_ota = "http://goods.test.yidian-inc.com/goods/ota/add"
+goods.background.ota_list = "http://goods.test.yidian-inc.com/goods/ota/list"
+goods.background.delete_ota = "http://goods.test.yidian-inc.com/goods/ota/delete"
+goods.background.update_ota = "http://goods.test.yidian-inc.com/goods/ota/update"
+
 ;分享
 goods.wx.appgc = "https://testwx.appgc.cn"
 goods.api.jwshq = "http://api.jwshq.cn"
@@ -448,7 +474,7 @@ goods.public.get_goods_sku = "http://goods.test.int.yidian-inc.com/goods/goods/g
 goods.public.goods_spu_shop_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_spu_shop_list"
 goods.public.get_marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/get_marketing_list"
 goods.public.get_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/get_distributor"
-
+goods.public.pindan_goods = "http://goods.test.int.yidian-inc.com/goods/goods/pindan_goods"
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.test.int.yidian-inc.com/user/user/wechat_login"
@@ -660,6 +686,19 @@ goods.marketing.distributor = "http://goods.dev.yidian-inc.com/marketing/distrib
 goods.marketing.distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_list"
 goods.marketing.distributor_code_url = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_code_url"
 goods.marketing.is_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/is_distributor"
+
+;自提点
+goods.marketing.add_take_place = "http://goods.dev.yidian-inc.com/marketing/takeplace/add"
+goods.marketing.take_place_list = "http://goods.dev.yidian-inc.com/marketing/takeplace/list"
+goods.marketing.delete_take_place = "http://goods.dev.yidian-inc.com/marketing/takeplace/delete"
+goods.marketing.get_bind_take_place_list = "http://goods.dev.yidian-inc.com/marketing/takeplace/get_bind_list"
+
+;供应商
+goods.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
+goods.background.ota_list = "http://goods.dev.yidian-inc.com/goods/ota/list"
+goods.background.delete_ota = "http://goods.dev.yidian-inc.com/goods/ota/delete"
+goods.background.update_ota = "http://goods.dev.yidian-inc.com/goods/ota/update"
+
 ;分享
 goods.wx.appgc = "https://testwx.appgc.cn"
 goods.api.jwshq = "http://api.jwshq.cn"
@@ -684,6 +723,7 @@ goods.public.get_goods_sku = "http://goods.dev.yidian-inc.com/goods/goods/get_go
 goods.public.goods_spu_shop_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_spu_shop_list"
 goods.public.get_marketing_list = "http://goods.dev.yidian-inc.com/marketing/marketing/get_marketing_list"
 goods.public.get_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/get_distributor"
+goods.public.pindan_goods = "http://goods.dev.yidian-inc.com/goods/goods/pindan_goods"
 
 
 ;用户绑定
@@ -701,7 +741,6 @@ goods.tcc.cancel_order_cancel = "http://goods.dev.yidian-inc.com/tcc/tcc/cancel_
 
 
 
-
 ;======================= 5000000-dev order微服务接口 ======================= 
 ;订单
 order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"

request.ini

+; 公共的配置内容，不区分应用及环境
 [common]
-;不打印日志的URL
 log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
+[merchant : common]
+
+; 生产环境
+[prod-merchant : merchant : common]
+
+; 预发环境
+[perf-merchant : prod-merchant : merchant : common]
+
+;测试测试
+[test-merchant : prod-merchant : merchant : common]
+
+;开发联调测试
+[dev-merchant : prod-merchant : merchant : common]