Commit 27a2d415 authored by guozhiyuan's avatar guozhiyuan

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

parents 52eb852d 553529ed
...@@ -69,6 +69,10 @@ merchant.recruit.create_recruit = "merchant.test.yidian-inc.com/lifeaccount/rec ...@@ -69,6 +69,10 @@ merchant.recruit.create_recruit = "merchant.test.yidian-inc.com/lifeaccount/rec
merchant.recruit.update_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit" merchant.recruit.update_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
merchant.recruit.get_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit" merchant.recruit.get_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
merchant.recruitinner.create_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/create_recruit"
merchant.recruitinner.update_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
merchant.recruitinner.get_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
merchant.enterprise.send_code = "merchant.test.yidian-inc.com/auth/verify/send_code" merchant.enterprise.send_code = "merchant.test.yidian-inc.com/auth/verify/send_code"
merchant.enterprise.check_code = "merchant.test.yidian-inc.com/auth/verify/check_code" merchant.enterprise.check_code = "merchant.test.yidian-inc.com/auth/verify/check_code"
...@@ -94,6 +98,8 @@ merchant.enterprise.life_info = "merchant.test.yidian-inc.com/auth/enterprise/li ...@@ -94,6 +98,8 @@ merchant.enterprise.life_info = "merchant.test.yidian-inc.com/auth/enterprise/li
merchant.enterprise.op_commit = "merchant.test.yidian-inc.com/auth/enterprise/op_commit" 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.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 = "interaction.test.yidian-inc.com/follow/index/follow"
interaction.index.follow_list = "interaction.test.yidian-inc.com/follow/index/follow_list" interaction.index.follow_list = "interaction.test.yidian-inc.com/follow/index/follow_list"
...@@ -139,6 +145,10 @@ merchant.recruit.create_recruit = "merchant.dev.yidian-inc.com/lifeaccount/recr ...@@ -139,6 +145,10 @@ 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.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.recruit.get_recruit = "merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
merchant.recruitinner.create_recruit = "merchant.dev.yidian-inc.com/lifeaccount/recruit/create_recruit"
merchant.recruitinner.update_recruit = "merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
merchant.recruitinner.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.get_role_list = "merchant.dev.yidian-inc.com/authority/authority/get_role_list"
...@@ -161,6 +171,8 @@ merchant.enterprise.life_info = "merchant.dev.yidian-inc.com/auth/enterprise/lif ...@@ -161,6 +171,8 @@ merchant.enterprise.life_info = "merchant.dev.yidian-inc.com/auth/enterprise/lif
merchant.enterprise.op_commit = "merchant.dev.yidian-inc.com/auth/enterprise/op_commit" 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.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 = "interaction.dev.yidian-inc.com/follow/index/follow"
interaction.index.follow_list = "interaction.dev.yidian-inc.com/follow/index/follow_list" interaction.index.follow_list = "interaction.dev.yidian-inc.com/follow/index/follow_list"
......
...@@ -25,4 +25,17 @@ gateway.uriOptions.wTimeoutMS=3000 ...@@ -25,4 +25,17 @@ gateway.uriOptions.wTimeoutMS=3000
gateway.driverOptions.typeMap.root='array' gateway.driverOptions.typeMap.root='array'
gateway.driverOptions.typeMap.document='array' gateway.driverOptions.typeMap.document='array'
xhprof.host="rs_bp_test_01.int.yidian-inc.com:27018,rs_bp_test_02.int.yidian-inc.com:27018,rs_bp_test_03.int.yidian-inc.com:27018"
xhprof.uriOptions.username='rs_bp_test_rw'
xhprof.uriOptions.password='uE5bLz9#GSHXzhuaAeTDqll65mM@XC'
xhprof.uriOptions.replicaSet='rs_bp_test'
xhprof.uriOptions.readPreference='secondaryPreferred'
xhprof.uriOptions.connectTimeoutMS=500
xhprof.uriOptions.socketTimeoutMS=6000
xhprof.uriOptions.w=1
xhprof.uriOptions.wTimeoutMS=3000
xhprof.driverOptions.typeMap.root='array'
xhprof.driverOptions.typeMap.document='array'
[dev-gateway : test-gateway : prod-gateway : gateway : common] [dev-gateway : test-gateway : prod-gateway : gateway : common]
\ No newline at end of file
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