Commit 69483fef authored by guozhiyuan's avatar guozhiyuan

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

parents 763d1475 ad4c8bca
...@@ -124,8 +124,9 @@ merchant.lifeaccount.get_account_info = "http://merchant.int.yidian-inc.com/life ...@@ -124,8 +124,9 @@ merchant.lifeaccount.get_account_info = "http://merchant.int.yidian-inc.com/life
merchant.lifeaccount.get_lid_by_uid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_lid_by_uid" merchant.lifeaccount.get_lid_by_uid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
merchant.lifeaccount.get_life_account_by_id = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_id" merchant.lifeaccount.get_life_account_by_id = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_id"
merchant.lifeaccount.get_life_account_by_ids = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
merchant.lifeaccount.get_life_account_by_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_name" merchant.lifeaccount.get_life_account_by_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_name"
merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_life_account_by_full_name"
merchant.lifeaccount.get_account_info_by_lid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_info_by_lid" merchant.lifeaccount.get_account_info_by_lid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
merchant.lifeaccount.batch_get_account_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/batch_get_account_name" merchant.lifeaccount.batch_get_account_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/batch_get_account_name"
...@@ -214,10 +215,12 @@ merchant.lifeaccount.get_lid_by_uid = "http://merchant.test.yidian-inc.com/lifea ...@@ -214,10 +215,12 @@ merchant.lifeaccount.get_lid_by_uid = "http://merchant.test.yidian-inc.com/lifea
merchant.lifeaccount.get_account_info_by_lid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_account_info_by_lid" merchant.lifeaccount.get_account_info_by_lid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
merchant.lifeaccount.get_life_account_by_id = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_id" merchant.lifeaccount.get_life_account_by_id = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_id"
merchant.lifeaccount.get_life_account_by_ids = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
merchant.lifeaccount.get_life_account_by_name = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_name" merchant.lifeaccount.get_life_account_by_name = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_name"
merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_full_name"
merchant.lifeaccount.batch_get_account_name = "merchant.test.yidian-inc.com/lifeaccount/account/batch_get_account_name" merchant.lifeaccount.batch_get_account_name = "merchant.test.yidian-inc.com/lifeaccount/account/batch_get_account_name"
merchant.lifeaccount.update_life_account = "merchant.test.yidian-inc.com/lifeaccount/account/update_life_account" merchant.lifeaccount.update_life_account = "merchant.test.yidian-inc.com/lifeaccount/account/update_life_account"
;互动项目 ;互动项目
interaction.index.follow = "http://interaction.test.yidian-inc.com/follow/index/follow" interaction.index.follow = "http://interaction.test.yidian-inc.com/follow/index/follow"
interaction.index.follow_list = "http://interaction.test.yidian-inc.com/follow/index/follow_list" interaction.index.follow_list = "http://interaction.test.yidian-inc.com/follow/index/follow_list"
...@@ -298,13 +301,14 @@ merchant.lifeaccount.get_account_info = "http://merchant.dev.yidian-inc.com/life ...@@ -298,13 +301,14 @@ merchant.lifeaccount.get_account_info = "http://merchant.dev.yidian-inc.com/life
merchant.lifeaccount.get_lid_by_uid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_lid_by_uid" merchant.lifeaccount.get_lid_by_uid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
merchant.lifeaccount.get_life_account_by_id = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_id" merchant.lifeaccount.get_life_account_by_id = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_id"
merchant.lifeaccount.get_life_account_by_ids = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
merchant.lifeaccount.get_account_info_by_lid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
merchant.lifeaccount.get_life_account_by_name = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_name" merchant.lifeaccount.get_life_account_by_name = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_name"
merchant.lifeaccount.get_life_account_by_full_name = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_full_name"
merchant.lifeaccount.get_account_info_by_lid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info_by_lid"
merchant.lifeaccount.batch_get_account_name = "merchant.dev.yidian-inc.com/lifeaccount/account/batch_get_account_name" merchant.lifeaccount.batch_get_account_name = "merchant.dev.yidian-inc.com/lifeaccount/account/batch_get_account_name"
merchant.lifeaccount.update_life_account = "merchant.dev.yidian-inc.com/lifeaccount/account/update_life_account" merchant.lifeaccount.update_life_account = "merchant.dev.yidian-inc.com/lifeaccount/account/update_life_account"
;互动项目 ;互动项目
interaction.index.follow = "http://interaction.dev.yidian-inc.com/follow/index/follow" interaction.index.follow = "http://interaction.dev.yidian-inc.com/follow/index/follow"
interaction.index.follow_list = "http://interaction.dev.yidian-inc.com/follow/index/follow_list" interaction.index.follow_list = "http://interaction.dev.yidian-inc.com/follow/index/follow_list"
......
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