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

interface.ini

@@ -41,6 +41,9 @@ merchant.personal.authentication = "merchant.test.yidian-inc.com/auth/personal/a
 merchant.life_account.create_unauthorized = "merchant.test.yidian-inc.com/lifeaccount/account/create_unauthorized"
 merchant.user.life_account_list = "merchant.test.yidian-inc.com/user/user/account_list"
 
+;登陆上报地理位置
+merchant.user.binding_location = "merchant.test.yidian-inc.com/user/user/binding_location"
+
 ;企业审核相关接口
 merchant.enterprise.ent_check           = "merchant.test.yidian-inc.com/auth/enterprise/check"
 merchant.enterprise.ent_commit          = "merchant.test.yidian-inc.com/auth/enterprise/business"
@@ -89,6 +92,18 @@ merchant.authority.add_user_role = "merchant.test.yidian-inc.com/authority/autho
 merchant.enterprise.life_list = "merchant.test.yidian-inc.com/auth/enterprise/life_list"
 merchant.enterprise.life_info = "merchant.test.yidian-inc.com/auth/enterprise/life_info"
 merchant.enterprise.op_commit = "merchant.test.yidian-inc.com/auth/enterprise/op_commit"
+merchant.enterprise.op_business_update = "merchant.test.yidian-inc.com/auth/enterprise/op_business_update"
+
+merchant.lifeaccount.get_account_by_lid = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_by_lid"
+
+;互动项目
+interaction.index.follow = "interaction.test.yidian-inc.com/follow/index/follow"
+interaction.index.follow_list = "interaction.test.yidian-inc.com/follow/index/follow_list"
+interaction.index.fans_list = "interaction.test.yidian-inc.com/follow/index/fans_list"
+interaction.index.is_follow = "interaction.test.yidian-inc.com/follow/index/is_follow"
+
+
+
 
 
 [dev-gateway : test-gateway : gateway : common]
@@ -100,6 +115,9 @@ merchant.personal.authentication = "merchant.dev.yidian-inc.com/auth/personal/au
 merchant.life_account.create_unauthorized = "merchant.dev.yidian-inc.com/lifeaccount/account/create_unauthorized"
 merchant.user.life_account_list = "merchant.dev.yidian-inc.com/user/user/account_list"
 
+;登陆上报地理位置
+merchant.user.binding_location = "merchant.dev.yidian-inc.com/user/user/binding_location"
+
 ;企业审核相关接口
 merchant.enterprise.ent_check        = "merchant.dev.yidian-inc.com/auth/enterprise/check"
 merchant.enterprise.ent_commit       = "merchant.dev.yidian-inc.com/auth/enterprise/business"
@@ -122,6 +140,7 @@ merchant.recruit.create_recruit  = "merchant.dev.yidian-inc.com/lifeaccount/recr
 merchant.recruit.update_recruit  = "merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
 merchant.recruit.get_recruit  = "merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
 
+
 ;管理员用户权限相关接口
 merchant.authority.get_role_list  = "merchant.dev.yidian-inc.com/authority/authority/get_role_list"
 merchant.authority.add_role  = "merchant.dev.yidian-inc.com/authority/authority/add_role"
@@ -141,6 +160,16 @@ merchant.authority.add_user_role = "merchant.dev.yidian-inc.com/authority/author
 merchant.enterprise.life_list = "merchant.dev.yidian-inc.com/auth/enterprise/life_list"
 merchant.enterprise.life_info = "merchant.dev.yidian-inc.com/auth/enterprise/life_info"
 merchant.enterprise.op_commit = "merchant.dev.yidian-inc.com/auth/enterprise/op_commit"
+merchant.enterprise.op_business_update = "merchant.dev.yidian-inc.com/auth/enterprise/op_business_update"
+
+merchant.lifeaccount.get_account_by_lid = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_by_lid"
+
+;互动项目
+interaction.index.follow = "interaction.dev.yidian-inc.com/follow/index/follow"
+interaction.index.follow_list = "interaction.dev.yidian-inc.com/follow/index/follow_list"
+interaction.index.fans_list = "interaction.dev.yidian-inc.com/follow/index/fans_list"
+interaction.index.is_follow = "interaction.test.yidian-inc.com/follow/index/is_follow"
+
 
 
 
@@ -166,4 +195,10 @@ service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
 ;idgen发号器
 service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
 
-[dev-goods : test-goods : goods : common]
\ No newline at end of file
+[dev-goods : test-goods : goods : common]
+
+[interaction:common]
+[test-interaction : interaction : common]
+merchant.account.get_role_list  = "merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
+[dev-interaction : test-interaction : interaction : common]
+merchant.account.get_role_list  = "merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
\ No newline at end of file