Commit 6f98cc5f authored by jianghaiming's avatar jianghaiming

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

parents 901547ae 4ace7614
...@@ -25,6 +25,7 @@ service.jw_user.get_user_info_by_user_id = "http://blend.jwshq.yidian-inc.com/ ...@@ -25,6 +25,7 @@ service.jw_user.get_user_info_by_user_id = "http://blend.jwshq.yidian-inc.com/
service.jw_user.get_user_list = "http://blend.jwshq.yidian-inc.com/ydInner/getUserList" service.jw_user.get_user_list = "http://blend.jwshq.yidian-inc.com/ydInner/getUserList"
service.jw_user.save_push_token = "http://blend.jwshq.yidian-inc.com/ydInnerToken/savePushToken" service.jw_user.save_push_token = "http://blend.jwshq.yidian-inc.com/ydInnerToken/savePushToken"
service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount" service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
service.jw_user.get_user_digg = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
;idgen发号器 ;idgen发号器
service.idgen = "http://idgen.int.yidian-inc.com/id/get" service.idgen = "http://idgen.int.yidian-inc.com/id/get"
...@@ -115,6 +116,10 @@ interaction.index.follow_list = "http://interact.int.yidian-inc.com/follow/index ...@@ -115,6 +116,10 @@ interaction.index.follow_list = "http://interact.int.yidian-inc.com/follow/index
interaction.index.is_follow = "http://interact.int.yidian-inc.com/follow/index/is_follow" interaction.index.is_follow = "http://interact.int.yidian-inc.com/follow/index/is_follow"
interaction.inner.digg = "http://interact.int.yidian-inc.com/follow/index/digg" interaction.inner.digg = "http://interact.int.yidian-inc.com/follow/index/digg"
interaction.inner.get_count_and_isfollow = "http://interact.int.yidian-inc.com/follow/index/get_count_and_isfollow" interaction.inner.get_count_and_isfollow = "http://interact.int.yidian-inc.com/follow/index/get_count_and_isfollow"
;互动调用生活号
merchant.account.get_role_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_user_list"
[perf : prod : common] [perf : prod : common]
...@@ -140,6 +145,7 @@ service.jw_user.get_user_info_by_user_id = "http://blend-test.api.appgc.yidian ...@@ -140,6 +145,7 @@ service.jw_user.get_user_info_by_user_id = "http://blend-test.api.appgc.yidian
service.jw_user.get_user_list = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserList" service.jw_user.get_user_list = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserList"
service.jw_user.save_push_token = "http://blend-test.api.appgc.yidian-inc.com/ydInnerToken/savePushToken" service.jw_user.save_push_token = "http://blend-test.api.appgc.yidian-inc.com/ydInnerToken/savePushToken"
service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount" service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
...@@ -235,6 +241,10 @@ interaction.index.follow_list = "http://interaction.test.yidian-inc.com/follow/i ...@@ -235,6 +241,10 @@ interaction.index.follow_list = "http://interaction.test.yidian-inc.com/follow/i
interaction.index.is_follow = "http://interaction.test.yidian-inc.com/follow/index/is_follow" interaction.index.is_follow = "http://interaction.test.yidian-inc.com/follow/index/is_follow"
interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/digg" interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/digg"
interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow" interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
;互动调用生活号
merchant.account.get_role_list = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_user_list"
;门店 ;门店
goods.shop.add_shop = "http://goods.test.int.yidian-inc.com/shop/shop/add_shop" goods.shop.add_shop = "http://goods.test.int.yidian-inc.com/shop/shop/add_shop"
...@@ -429,6 +439,10 @@ interaction.index.follow_list = "http://interaction.dev.yidian-inc.com/follow/in ...@@ -429,6 +439,10 @@ interaction.index.follow_list = "http://interaction.dev.yidian-inc.com/follow/in
interaction.index.is_follow = "http://interaction.dev.yidian-inc.com/follow/index/is_follow" interaction.index.is_follow = "http://interaction.dev.yidian-inc.com/follow/index/is_follow"
interaction.inner.digg = "http://interaction.dev.yidian-inc.com/follow/index/digg" interaction.inner.digg = "http://interaction.dev.yidian-inc.com/follow/index/digg"
interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.com/follow/index/get_count_and_isfollow" interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.com/follow/index/get_count_and_isfollow"
;互动调用生活号
merchant.account.get_role_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_user_list"
;门店 ;门店
goods.shop.add_shop = "http://goods.dev.yidian-inc.com/shop/shop/add_shop" goods.shop.add_shop = "http://goods.dev.yidian-inc.com/shop/shop/add_shop"
...@@ -589,21 +603,7 @@ order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_or ...@@ -589,21 +603,7 @@ order.tcc.cancel_order_main = "http://order.dev.yidian-inc.com/tcc/tcc/cancel_or
; ======================= interaction ================================================================================== ; ======================= interaction ==================================================================================
[prod-interaction : prod] [prod-interaction : prod]
merchant.account.get_role_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_user_list"
service.jw_user.get_user_digg = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
[perf-interaction : perf] [perf-interaction : perf]
[test-interaction : test] [test-interaction : test]
merchant.account.get_role_list = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_user_list"
service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
[dev-interaction : dev] [dev-interaction : dev]
merchant.account.get_role_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
merchant.account.get_life_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_list"
merchant.account.get_user_list = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_user_list"
service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
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