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

bizcode.ini

+[prefix]
+gateway=1000000
+merchant=2000000
+interaction=3000000
+goods=4000000
+order=5000000
+pay=6000000
+account=7000000
+wallet=8000000
\ No newline at end of file

interface.ini

@@ -17,14 +17,15 @@ service.session.delete          = "http://a4.go2yd.com/Website/session/delete-se
 service.session.mget            = "http://a4.go2yd.com/Website/session/get-many-session"
 
 ;简网用户信息,目前测试域名，后期换成生产域名！！！
-service.jw_user.get_user_info       = "testblend.jwshq.cn/ydInner/getUserInfoByMobile"
-service.jw_user.get_all_city_tree   = "testblend.jwshq.cn/ydInner/getAllCityTree"
-service.jw_user.get_user_info_by_user_id   = "testblend.jwshq.cn/ydInner/getUserInfoByUserId"
-service.jw_user.get_user_list   = "testblend.jwshq.cn/ydInner/getUserList"
-service.jw_user.save_push_token = "testblend.jwshq.cn/ydInnerToken/savePushToken"
+service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
+service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
+service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
+service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
+service.jw_user.save_push_token = "http://testblend.jwshq.cn/ydInnerToken/savePushToken"
+service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount/saveOrUpdateLifeAccount"
 
 ;idgen发号器
-service.idgen = "idgen.int.yidian-inc.com/id/get"
+service.idgen = "http://idgen.int.yidian-inc.com/id/get"
 
 [perf : prod : common]
 
@@ -42,14 +43,15 @@ service.session.delete          = "http://a4-1.go2yd.com/Website/session/delete-
 service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-many-session"
 
 ;简网用户信息
-service.jw_user.get_user_info       = "testblend.jwshq.cn/ydInner/getUserInfoByMobile"
-service.jw_user.get_all_city_tree   = "testblend.jwshq.cn/ydInner/getAllCityTree"
-service.jw_user.get_user_info_by_user_id   = "testblend.jwshq.cn/ydInner/getUserInfoByUserId"
-service.jw_user.get_user_list   = "testblend.jwshq.cn/ydInner/getUserList"
-service.jw_user.save_push_token = "testblend.jwshq.cn/ydInnerToken/savePushToken"
+service.jw_user.get_user_info       = "http://testblend.jwshq.cn/ydInner/getUserInfoByMobile"
+service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllCityTree"
+service.jw_user.get_user_info_by_user_id   = "http://testblend.jwshq.cn/ydInner/getUserInfoByUserId"
+service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
+service.jw_user.save_push_token = "http://testblend.jwshq.cn/ydInnerToken/savePushToken"
+service.jw_user.save_update_life = "http://testblend.jwshq.cn/ydInnerLifeAccount/saveOrUpdateLifeAccount"
 
 ;idgen发号器
-service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
+service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
 
 [dev : test : common]
 
@@ -57,76 +59,87 @@ service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
 
 [prod-gateway : prod]
 ;用户审核相关接口
-merchant.personal.check = "merchant.int.yidian-inc.com/auth/personal/check"
-merchant.personal.live_identity = "merchant.int.yidian-inc.com/auth/personal/live_identity"
-merchant.personal.complete = "merchant.int.yidian-inc.com/auth/personal/complete"
-merchant.personal.authentication = "merchant.int.yidian-inc.com/auth/personal/authentication"
-merchant.life_account.create_unauthorized = "merchant.int.yidian-inc.com/lifeaccount/account/create_unauthorized"
-merchant.user.life_account_list = "merchant.int.yidian-inc.com/user/user/account_list"
+merchant.personal.check = "http://merchant.int.yidian-inc.com/auth/personal/check"
+merchant.personal.live_identity = "http://merchant.int.yidian-inc.com/auth/personal/live_identity"
+merchant.personal.complete = "http://merchant.int.yidian-inc.com/auth/personal/complete"
+merchant.personal.authentication = "http://merchant.int.yidian-inc.com/auth/personal/authentication"
+merchant.life_account.create_unauthorized = "http://merchant.int.yidian-inc.com/lifeaccount/account/create_unauthorized"
+merchant.user.life_account_list = "http://merchant.int.yidian-inc.com/user/user/account_list"
 
 ;登陆上报地理位置
-merchant.user.binding_location = "merchant.int.yidian-inc.com/user/user/binding_location"
+merchant.user.binding_location = "http://merchant.int.yidian-inc.com/user/user/binding_location"
 
 ;企业审核相关接口
-merchant.enterprise.ent_check           = "merchant.int.yidian-inc.com/auth/enterprise/check"
-merchant.enterprise.ent_commit          = "merchant.int.yidian-inc.com/auth/enterprise/business"
-merchant.enterprise.legal_commit        = "merchant.int.yidian-inc.com/auth/enterprise/legal"
-merchant.enterprise.ent_personal        = "merchant.int.yidian-inc.com/auth/enterprise/employed"
-merchant.enterprise.live_identity       = "merchant.int.yidian-inc.com/auth/enterprise/live"
-merchant.enterprise.check_life          = "merchant.int.yidian-inc.com/auth/enterprise/check_life"
-merchant.enterprise.create_life         = "merchant.int.yidian-inc.com/auth/enterprise/employed_complate"
-merchant.enterprise.audit               = "merchant.int.yidian-inc.com/auth/enterprise/audit"
-merchant.enterprise.audit_list          = "merchant.int.yidian-inc.com/auth/enterprise/audit_list"
-merchant.enterprise.add_user            = "merchant.int.yidian-inc.com/auth/enterprise/add_user"
-merchant.enterprise.complete            = "merchant.int.yidian-inc.com/auth/enterprise/complete"
-merchant.enterprise.get_record_info     = "merchant.int.yidian-inc.com/auth/enterprise/get_record_info"
-merchant.enterprise.get_log             = "merchant.int.yidian-inc.com/auth/enterprise/get_log"
-merchant.enterprise.get_account_role_list   = "merchant.int.yidian-inc.com/auth/enterprise/get_account_role_list"
-merchant.enterprise.send_mobile_code   = "merchant.int.yidian-inc.com/auth/enterprise/send_mobile_code"
-merchant.enterprise.check_mobile_code   = "merchant.int.yidian-inc.com/auth/enterprise/check_mobile_code"
-merchant.enterprise.change_role   = "merchant.int.yidian-inc.com/auth/enterprise/change_role"
-merchant.enterprise.delete_life_user   = "merchant.int.yidian-inc.com/auth/enterprise/delete_life_user"
-
-merchant.recruit.create_recruit  = "merchant.int.yidian-inc.com/lifeaccount/recruit/create_recruit"
-merchant.recruit.update_recruit  = "merchant.int.yidian-inc.com/lifeaccount/recruit/update_recruit"
-merchant.recruit.get_recruit  = "merchant.int.yidian-inc.com/lifeaccount/recruit/get_recruit"
-
-merchant.recruitinner.create_recruit  = "merchant.int.yidian-inc.com/lifeaccount/recruit/create_recruit"
-merchant.recruitinner.update_recruit  = "merchant.int.yidian-inc.com/lifeaccount/recruit/update_recruit"
-merchant.recruitinner.get_recruit  = "merchant.int.yidian-inc.com/lifeaccount/recruit/get_recruit"
-
-merchant.enterprise.send_code   = "merchant.int.yidian-inc.com/auth/verify/send_code"
-merchant.enterprise.check_code   = "merchant.int.yidian-inc.com/auth/verify/check_code"
+merchant.enterprise.ent_check           = "http://merchant.int.yidian-inc.com/auth/enterprise/check"
+merchant.enterprise.ent_commit          = "http://merchant.int.yidian-inc.com/auth/enterprise/business"
+merchant.enterprise.legal_commit        = "http://merchant.int.yidian-inc.com/auth/enterprise/legal"
+merchant.enterprise.ent_personal        = "http://merchant.int.yidian-inc.com/auth/enterprise/employed"
+merchant.enterprise.live_identity       = "http://merchant.int.yidian-inc.com/auth/enterprise/live"
+merchant.enterprise.check_life          = "http://merchant.int.yidian-inc.com/auth/enterprise/check_life"
+merchant.enterprise.create_life         = "http://merchant.int.yidian-inc.com/auth/enterprise/employed_complate"
+merchant.enterprise.audit               = "http://merchant.int.yidian-inc.com/auth/enterprise/audit"
+merchant.enterprise.audit_list          = "http://merchant.int.yidian-inc.com/auth/enterprise/audit_list"
+merchant.enterprise.add_user            = "http://merchant.int.yidian-inc.com/auth/enterprise/add_user"
+merchant.enterprise.complete            = "http://merchant.int.yidian-inc.com/auth/enterprise/complete"
+merchant.enterprise.get_record_info     = "http://merchant.int.yidian-inc.com/auth/enterprise/get_record_info"
+merchant.enterprise.get_log             = "http://merchant.int.yidian-inc.com/auth/enterprise/get_log"
+merchant.enterprise.get_account_role_list   = "http://merchant.int.yidian-inc.com/auth/enterprise/get_account_role_list"
+merchant.enterprise.send_mobile_code   = "http://merchant.int.yidian-inc.com/auth/enterprise/send_mobile_code"
+merchant.enterprise.check_mobile_code   = "http://merchant.int.yidian-inc.com/auth/enterprise/check_mobile_code"
+merchant.enterprise.change_role   = "http://merchant.int.yidian-inc.com/auth/enterprise/change_role"
+merchant.enterprise.delete_life_user   = "http://merchant.int.yidian-inc.com/auth/enterprise/delete_life_user"
+
+merchant.recruit.create_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/create_recruit"
+merchant.recruit.update_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/update_recruit"
+merchant.recruit.get_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_recruit"
+
+merchant.recruitinner.create_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/create_recruit"
+merchant.recruitinner.update_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/update_recruit"
+merchant.recruitinner.get_recruit  = "http://merchant.int.yidian-inc.com/lifeaccount/recruit/get_recruit"
+
+merchant.enterprise.send_code   = "http://merchant.int.yidian-inc.com/auth/verify/send_code"
+merchant.enterprise.check_code   = "http://merchant.int.yidian-inc.com/auth/verify/check_code"
 
 ;管理员用户权限相关接口
-merchant.authority.get_role_list  = "merchant.int.yidian-inc.com/authority/authority/get_role_list"
-merchant.authority.add_role  = "merchant.int.yidian-inc.com/authority/authority/add_role"
-merchant.authority.role_list  = "merchant.int.yidian-inc.com/authority/authority/role_list"
-merchant.authority.get_role_info = "merchant.int.yidian-inc.com/authority/authority/get_role_info"
-merchant.authority.update_role = "merchant.int.yidian-inc.com/authority/authority/update_role"
-merchant.authority.delete_role = "merchant.int.yidian-inc.com/authority/authority/delete_role"
-
-merchant.authority.get_user_list = "merchant.int.yidian-inc.com/authority/authority/get_user_list"
-merchant.authority.get_user_info = "merchant.int.yidian-inc.com/authority/authority/get_user_info"
-merchant.authority.update_user = "merchant.int.yidian-inc.com/authority/authority/update_user"
-merchant.authority.add_user_role = "merchant.int.yidian-inc.com/authority/authority/add_user_role"
+merchant.authority.get_role_list  = "http://merchant.int.yidian-inc.com/authority/authority/get_role_list"
+merchant.authority.add_role  = "http://merchant.int.yidian-inc.com/authority/authority/add_role"
+merchant.authority.role_list  = "http://merchant.int.yidian-inc.com/authority/authority/role_list"
+merchant.authority.get_role_info = "http://merchant.int.yidian-inc.com/authority/authority/get_role_info"
+merchant.authority.update_role = "http://merchant.int.yidian-inc.com/authority/authority/update_role"
+merchant.authority.delete_role = "http://merchant.int.yidian-inc.com/authority/authority/delete_role"
+
+merchant.authority.get_user_list = "http://merchant.int.yidian-inc.com/authority/authority/get_user_list"
+merchant.authority.get_user_info = "http://merchant.int.yidian-inc.com/authority/authority/get_user_info"
+merchant.authority.update_user = "http://merchant.int.yidian-inc.com/authority/authority/update_user"
+merchant.authority.add_user_role = "http://merchant.int.yidian-inc.com/authority/authority/add_user_role"
 
 ;后台op接口
-merchant.enterprise.life_list = "merchant.int.yidian-inc.com/auth/enterprise/life_list"
-merchant.enterprise.life_info = "merchant.int.yidian-inc.com/auth/enterprise/life_info"
-merchant.enterprise.op_commit = "merchant.int.yidian-inc.com/auth/enterprise/op_commit"
-merchant.enterprise.op_business_update = "merchant.int.yidian-inc.com/auth/enterprise/op_business_update"
+merchant.enterprise.life_list = "http://merchant.int.yidian-inc.com/auth/enterprise/life_list"
+merchant.enterprise.life_info = "http://merchant.int.yidian-inc.com/auth/enterprise/life_info"
+merchant.enterprise.op_commit = "http://merchant.int.yidian-inc.com/auth/enterprise/op_commit"
+merchant.enterprise.op_business_update = "http://merchant.int.yidian-inc.com/auth/enterprise/op_business_update"
 
-merchant.lifeaccount.get_account_by_lid = "merchant.int.yidian-inc.com/lifeaccount/account/get_account_by_lid"
+merchant.lifeaccount.get_account_by_lid = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_by_lid"
 
-merchant.lifeaccount.get_account_info = "merchant.int.yidian-inc.com/lifeaccount/account/get_account_info"
+merchant.lifeaccount.get_account_info = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_account_info"
 
+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_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_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.batch_get_account_name = "http://merchant.int.yidian-inc.com/lifeaccount/account/batch_get_account_name"
+merchant.lifeaccount.update_life_account = "http://merchant.int.yidian-inc.com/lifeaccount/account/update_life_account"
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.int.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 ;互动项目
-interaction.index.follow = "interact.int.yidian-inc.com/follow/index/follow"
-interaction.index.follow_list = "interact.int.yidian-inc.com/follow/index/follow_list"
-interaction.index.is_follow = "interact.int.yidian-inc.com/follow/index/is_follow"
-interaction.inner.digg = "interact.int.yidian-inc.com/follow/index/digg"
-interaction.index.life_detail = "interact.int.yidian-inc.com/follow/index/get_count"
+interaction.index.follow = "http://interact.int.yidian-inc.com/follow/index/follow"
+interaction.index.follow_list = "http://interact.int.yidian-inc.com/follow/index/follow_list"
+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.get_count_and_isfollow = "http://interact.int.yidian-inc.com/follow/index/get_count_and_isfollow"
 
 [perf-gateway : perf : prod-gateway]
 
@@ -135,162 +148,252 @@ interaction.index.life_detail = "interact.int.yidian-inc.com/follow/index/get_co
 
 
 ;用户审核相关接口
-merchant.personal.check = "merchant.test.yidian-inc.com/auth/personal/check"
-merchant.personal.live_identity = "merchant.test.yidian-inc.com/auth/personal/live_identity"
-merchant.personal.complete = "merchant.test.yidian-inc.com/auth/personal/complete"
-merchant.personal.authentication = "merchant.test.yidian-inc.com/auth/personal/authentication"
-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.personal.check = "http://merchant.test.yidian-inc.com/auth/personal/check"
+merchant.personal.live_identity = "http://merchant.test.yidian-inc.com/auth/personal/live_identity"
+merchant.personal.complete = "http://merchant.test.yidian-inc.com/auth/personal/complete"
+merchant.personal.authentication = "http://merchant.test.yidian-inc.com/auth/personal/authentication"
+merchant.life_account.create_unauthorized = "http://merchant.test.yidian-inc.com/lifeaccount/account/create_unauthorized"
+merchant.user.life_account_list = "http://merchant.test.yidian-inc.com/user/user/account_list"
 
 ;登陆上报地理位置
-merchant.user.binding_location = "merchant.test.yidian-inc.com/user/user/binding_location"
+merchant.user.binding_location = "http://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"
-merchant.enterprise.legal_commit        = "merchant.test.yidian-inc.com/auth/enterprise/legal"
-merchant.enterprise.ent_personal        = "merchant.test.yidian-inc.com/auth/enterprise/employed"
-merchant.enterprise.live_identity       = "merchant.test.yidian-inc.com/auth/enterprise/live"
-merchant.enterprise.check_life          = "merchant.test.yidian-inc.com/auth/enterprise/check_life"
-merchant.enterprise.create_life         = "merchant.test.yidian-inc.com/auth/enterprise/employed_complate"
-merchant.enterprise.audit               = "merchant.test.yidian-inc.com/auth/enterprise/audit"
-merchant.enterprise.audit_list          = "merchant.test.yidian-inc.com/auth/enterprise/audit_list"
-merchant.enterprise.add_user            = "merchant.test.yidian-inc.com/auth/enterprise/add_user"
-merchant.enterprise.complete            = "merchant.test.yidian-inc.com/auth/enterprise/complete"
-merchant.enterprise.get_record_info     = "merchant.test.yidian-inc.com/auth/enterprise/get_record_info"
-merchant.enterprise.get_log             = "merchant.test.yidian-inc.com/auth/enterprise/get_log"
-merchant.enterprise.get_account_role_list   = "merchant.test.yidian-inc.com/auth/enterprise/get_account_role_list"
-merchant.enterprise.send_mobile_code   = "merchant.test.yidian-inc.com/auth/enterprise/send_mobile_code"
-merchant.enterprise.check_mobile_code   = "merchant.test.yidian-inc.com/auth/enterprise/check_mobile_code"
-merchant.enterprise.change_role   = "merchant.test.yidian-inc.com/auth/enterprise/change_role"
-merchant.enterprise.delete_life_user   = "merchant.test.yidian-inc.com/auth/enterprise/delete_life_user"
-
-merchant.recruit.create_recruit  = "merchant.test.yidian-inc.com/lifeaccount/recruit/create_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.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.check_code   = "merchant.test.yidian-inc.com/auth/verify/check_code"
+merchant.enterprise.ent_check           = "http://merchant.test.yidian-inc.com/auth/enterprise/check"
+merchant.enterprise.ent_commit          = "http://merchant.test.yidian-inc.com/auth/enterprise/business"
+merchant.enterprise.legal_commit        = "http://merchant.test.yidian-inc.com/auth/enterprise/legal"
+merchant.enterprise.ent_personal        = "http://merchant.test.yidian-inc.com/auth/enterprise/employed"
+merchant.enterprise.live_identity       = "http://merchant.test.yidian-inc.com/auth/enterprise/live"
+merchant.enterprise.check_life          = "http://merchant.test.yidian-inc.com/auth/enterprise/check_life"
+merchant.enterprise.create_life         = "http://merchant.test.yidian-inc.com/auth/enterprise/employed_complate"
+merchant.enterprise.audit               = "http://merchant.test.yidian-inc.com/auth/enterprise/audit"
+merchant.enterprise.audit_list          = "http://merchant.test.yidian-inc.com/auth/enterprise/audit_list"
+merchant.enterprise.add_user            = "http://merchant.test.yidian-inc.com/auth/enterprise/add_user"
+merchant.enterprise.complete            = "http://merchant.test.yidian-inc.com/auth/enterprise/complete"
+merchant.enterprise.get_record_info     = "http://merchant.test.yidian-inc.com/auth/enterprise/get_record_info"
+merchant.enterprise.get_log             = "http://merchant.test.yidian-inc.com/auth/enterprise/get_log"
+merchant.enterprise.get_account_role_list   = "http://merchant.test.yidian-inc.com/auth/enterprise/get_account_role_list"
+merchant.enterprise.send_mobile_code   = "http://merchant.test.yidian-inc.com/auth/enterprise/send_mobile_code"
+merchant.enterprise.check_mobile_code   = "http://merchant.test.yidian-inc.com/auth/enterprise/check_mobile_code"
+merchant.enterprise.change_role   = "http://merchant.test.yidian-inc.com/auth/enterprise/change_role"
+merchant.enterprise.delete_life_user   = "http://merchant.test.yidian-inc.com/auth/enterprise/delete_life_user"
+
+merchant.recruit.create_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/create_recruit"
+merchant.recruit.update_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
+merchant.recruit.get_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
+
+merchant.recruitinner.create_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/create_recruit"
+merchant.recruitinner.update_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
+merchant.recruitinner.get_recruit  = "http://merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
+
+merchant.enterprise.send_code   = "http://merchant.test.yidian-inc.com/auth/verify/send_code"
+merchant.enterprise.check_code   = "http://merchant.test.yidian-inc.com/auth/verify/check_code"
 
 ;管理员用户权限相关接口
-merchant.authority.get_role_list  = "merchant.test.yidian-inc.com/authority/authority/get_role_list"
-merchant.authority.add_role  = "merchant.test.yidian-inc.com/authority/authority/add_role"
-merchant.authority.role_list  = "merchant.test.yidian-inc.com/authority/authority/role_list"
-merchant.authority.get_role_info = "merchant.test.yidian-inc.com/authority/authority/get_role_info"
-merchant.authority.update_role = "merchant.test.yidian-inc.com/authority/authority/update_role"
-merchant.authority.delete_role = "merchant.test.yidian-inc.com/authority/authority/delete_role"
+merchant.authority.get_role_list  = "http://merchant.test.yidian-inc.com/authority/authority/get_role_list"
+merchant.authority.add_role  = "http://merchant.test.yidian-inc.com/authority/authority/add_role"
+merchant.authority.role_list  = "http://merchant.test.yidian-inc.com/authority/authority/role_list"
+merchant.authority.get_role_info = "http://merchant.test.yidian-inc.com/authority/authority/get_role_info"
+merchant.authority.update_role = "http://merchant.test.yidian-inc.com/authority/authority/update_role"
+merchant.authority.delete_role = "http://merchant.test.yidian-inc.com/authority/authority/delete_role"
 
-merchant.authority.get_user_list = "merchant.test.yidian-inc.com/authority/authority/get_user_list"
-merchant.authority.get_user_info = "merchant.test.yidian-inc.com/authority/authority/get_user_info"
-merchant.authority.update_user = "merchant.test.yidian-inc.com/authority/authority/update_user"
-merchant.authority.add_user_role = "merchant.test.yidian-inc.com/authority/authority/add_user_role"
+merchant.authority.get_user_list = "http://merchant.test.yidian-inc.com/authority/authority/get_user_list"
+merchant.authority.get_user_info = "http://merchant.test.yidian-inc.com/authority/authority/get_user_info"
+merchant.authority.update_user = "http://merchant.test.yidian-inc.com/authority/authority/update_user"
+merchant.authority.add_user_role = "http://merchant.test.yidian-inc.com/authority/authority/add_user_role"
 
 
 ;后台op接口
-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.enterprise.life_list = "http://merchant.test.yidian-inc.com/auth/enterprise/life_list"
+merchant.enterprise.life_info = "http://merchant.test.yidian-inc.com/auth/enterprise/life_info"
+merchant.enterprise.op_commit = "http://merchant.test.yidian-inc.com/auth/enterprise/op_commit"
+merchant.enterprise.op_business_update = "http://merchant.test.yidian-inc.com/auth/enterprise/op_business_update"
+
+merchant.lifeaccount.get_account_by_lid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_account_by_lid"
 
-merchant.lifeaccount.get_account_by_lid = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_by_lid"
+merchant.lifeaccount.get_account_info = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_account_info"
 
-merchant.lifeaccount.get_account_info = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_info"
+merchant.lifeaccount.get_lid_by_uid = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
 
-merchant.lifeaccount.get_lid_by_uid = "merchant.test.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
+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_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_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.update_life_account = "merchant.test.yidian-inc.com/lifeaccount/account/update_life_account"
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 ;互动项目
-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.is_follow = "interaction.test.yidian-inc.com/follow/index/is_follow"
-interaction.inner.digg = "interaction.test.yidian-inc.com/follow/index/digg"
-interaction.index.life_detail = "interaction.test.yidian-inc.com/follow/index/get_count"
+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.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.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
 
 ;门店
-goods.shop.add_shop = "goods.test.yidian-inc.com/shop/shop/add_shop"
-goods.shop.get_shop_list = "goods.test.yidian-inc.com/shop/shop/get_shop_list"
+goods.shop.add_shop = "http://goods.test.int.yidian-inc.com/shop/shop/add_shop"
+goods.shop.get_shop_list = "http://goods.test.int.yidian-inc.com/shop/shop/get_shop_list"
+goods.shop.get_shop_info = "http://goods.test.int.yidian-inc.com/shop/shop/get_shop_info"
+goods.shop.update_shop = "http://goods.test.int.yidian-inc.com/shop/shop/update_shop"
+goods.shop.shop_list = "http://goods.test.int.yidian-inc.com/shop/shop/shop_list"
+
+;分销活动
+goods.marketing.marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_list"
+goods.marketing.add_marketing = "http://goods.test.int.yidian-inc.com/marketing/marketing/add_marketing"
+goods.marketing.update_marketing = "http://goods.test.int.yidian-inc.com/marketing/marketing/update_marketing"
+goods.marketing.marketing_info = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_info"
+goods.marketing.marketing_goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/marketing_goods_list"
+goods.marketing.generate_share_goods = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
+goods.marketing.goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_list"
+
+
+
+;团长
+goods.marketing.second_distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/second_distributor_list"
+goods.marketing.apply_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_distributor"
+goods.marketing.apply_second_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_second_distributor"
+goods.marketing.send_sms_code = "http://goods.test.int.yidian-inc.com/marketing/distributor/send_sms_code"
+goods.marketing.distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor"
+goods.marketing.distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/distributor_list"
+
+;商品
+goods.public.get_goods_category_list = "http://goods.test.int.yidian-inc.com/goods/goods/get_goods_category_list"
+goods.public.goods_edit = "http://goods.test.int.yidian-inc.com/goods/goods/edit"
+goods.public.goods_online_offline = "http://goods.test.int.yidian-inc.com/goods/goods/online_offline"
+goods.public.check_goods_name = "http://goods.test.int.yidian-inc.com/goods/goods/check_goods_name"
+
+goods.background.goods_list_op = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_op"
+goods.background.goods_info_op = "http://goods.test.int.yidian-inc.com/goods/goods/info_op"
+goods.background.goods_audit = "http://goods.test.int.yidian-inc.com/goods/goods/audit"
+
+goods.consumer.goods_list_c = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_c"
+goods.consumer.goods_list_es = "http://goods.test.int.yidian-inc.com/goods/goods/goods_list_es"
+goods.consumer.goods_info = "http://goods.test.int.yidian-inc.com/goods/goods/info_fe"
+goods.consumer.goods_add = "http://goods.test.int.yidian-inc.com/goods/goods/add"
+
+;订单
+order.order.user_order_list = "http://order.test.yidian-inc.com/order/order/user_order_list"
+order.order.merchant_order_list = "http://order.test.yidian-inc.com/order/order/merchant_order_list"
+
+
+
 
 [dev-gateway : dev]
 ;用户审核相关接口
-merchant.personal.check = "merchant.dev.yidian-inc.com/auth/personal/check"
-merchant.personal.live_identity = "merchant.dev.yidian-inc.com/auth/personal/live_identity"
-merchant.personal.complete = "merchant.dev.yidian-inc.com/auth/personal/complete"
-merchant.personal.authentication = "merchant.dev.yidian-inc.com/auth/personal/authentication"
-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.personal.check = "http://merchant.dev.yidian-inc.com/auth/personal/check"
+merchant.personal.live_identity = "http://merchant.dev.yidian-inc.com/auth/personal/live_identity"
+merchant.personal.complete = "http://merchant.dev.yidian-inc.com/auth/personal/complete"
+merchant.personal.authentication = "http://merchant.dev.yidian-inc.com/auth/personal/authentication"
+merchant.life_account.create_unauthorized = "http://merchant.dev.yidian-inc.com/lifeaccount/account/create_unauthorized"
+merchant.user.life_account_list = "http://merchant.dev.yidian-inc.com/user/user/account_list"
 
 ;登陆上报地理位置
-merchant.user.binding_location = "merchant.dev.yidian-inc.com/user/user/binding_location"
+merchant.user.binding_location = "http://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"
-merchant.enterprise.legal_commit     = "merchant.dev.yidian-inc.com/auth/enterprise/legal"
-merchant.enterprise.ent_personal     = "merchant.dev.yidian-inc.com/auth/enterprise/employed"
-merchant.enterprise.live_identity    = "merchant.dev.yidian-inc.com/auth/enterprise/live"
-merchant.enterprise.check_life      = "merchant.dev.yidian-inc.com/auth/enterprise/check_life"
-merchant.enterprise.create_life      = "merchant.dev.yidian-inc.com/auth/enterprise/employed_complate"
-merchant.enterprise.audit           = "merchant.dev.yidian-inc.com/auth/enterprise/audit"
-merchant.enterprise.audit_list      = "merchant.dev.yidian-inc.com/auth/enterprise/audit_list"
-merchant.enterprise.add_user         = "merchant.dev.yidian-inc.com/auth/enterprise/add_user"
-merchant.enterprise.complete         = "merchant.dev.yidian-inc.com/auth/enterprise/complete"
-merchant.enterprise.get_record_info     = "merchant.dev.yidian-inc.com/auth/enterprise/get_record_info"
-merchant.enterprise.get_log             = "merchant.dev.yidian-inc.com/auth/enterprise/get_log"
-merchant.enterprise.get_account_role_list   = "merchant.dev.yidian-inc.com/auth/enterprise/get_account_role_list"
-merchant.enterprise.send_code   = "merchant.dev.yidian-inc.com/auth/verify/send_code"
-merchant.enterprise.check_code   = "merchant.dev.yidian-inc.com/auth/verify/check_code"
-
-merchant.enterprise.send_mobile_code   = "merchant.dev.yidian-inc.com/auth/enterprise/send_mobile_code"
-merchant.enterprise.check_mobile_code   = "merchant.dev.yidian-inc.com/auth/enterprise/check_mobile_code"
-merchant.enterprise.change_role   = "merchant.dev.yidian-inc.com/auth/enterprise/change_role"
-merchant.enterprise.delete_life_user   = "merchant.dev.yidian-inc.com/auth/enterprise/delete_life_user"
-
-merchant.recruit.create_recruit  = "merchant.dev.yidian-inc.com/lifeaccount/recruit/create_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.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.enterprise.ent_check        = "http://merchant.dev.yidian-inc.com/auth/enterprise/check"
+merchant.enterprise.ent_commit       = "http://merchant.dev.yidian-inc.com/auth/enterprise/business"
+merchant.enterprise.legal_commit     = "http://merchant.dev.yidian-inc.com/auth/enterprise/legal"
+merchant.enterprise.ent_personal     = "http://merchant.dev.yidian-inc.com/auth/enterprise/employed"
+merchant.enterprise.live_identity    = "http://merchant.dev.yidian-inc.com/auth/enterprise/live"
+merchant.enterprise.check_life      = "http://merchant.dev.yidian-inc.com/auth/enterprise/check_life"
+merchant.enterprise.create_life      = "http://merchant.dev.yidian-inc.com/auth/enterprise/employed_complate"
+merchant.enterprise.audit           = "http://merchant.dev.yidian-inc.com/auth/enterprise/audit"
+merchant.enterprise.audit_list      = "http://merchant.dev.yidian-inc.com/auth/enterprise/audit_list"
+merchant.enterprise.add_user         = "http://merchant.dev.yidian-inc.com/auth/enterprise/add_user"
+merchant.enterprise.complete         = "http://merchant.dev.yidian-inc.com/auth/enterprise/complete"
+merchant.enterprise.get_record_info     = "http://merchant.dev.yidian-inc.com/auth/enterprise/get_record_info"
+merchant.enterprise.get_log             = "http://merchant.dev.yidian-inc.com/auth/enterprise/get_log"
+merchant.enterprise.get_account_role_list   = "http://merchant.dev.yidian-inc.com/auth/enterprise/get_account_role_list"
+merchant.enterprise.send_code   = "http://merchant.dev.yidian-inc.com/auth/verify/send_code"
+merchant.enterprise.check_code   = "http://merchant.dev.yidian-inc.com/auth/verify/check_code"
+
+merchant.enterprise.send_mobile_code   = "http://merchant.dev.yidian-inc.com/auth/enterprise/send_mobile_code"
+merchant.enterprise.check_mobile_code   = "http://merchant.dev.yidian-inc.com/auth/enterprise/check_mobile_code"
+merchant.enterprise.change_role   = "http://merchant.dev.yidian-inc.com/auth/enterprise/change_role"
+merchant.enterprise.delete_life_user   = "http://merchant.dev.yidian-inc.com/auth/enterprise/delete_life_user"
+
+merchant.recruit.create_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/create_recruit"
+merchant.recruit.update_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
+merchant.recruit.get_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
+
+merchant.recruitinner.create_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/create_recruit"
+merchant.recruitinner.update_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
+merchant.recruitinner.get_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
+
+merchant.recruitinner.batch_recruit  = "http://merchant.dev.yidian-inc.com/lifeaccount/recruit/check_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"
-merchant.authority.role_list  = "merchant.dev.yidian-inc.com/authority/authority/role_list"
-merchant.authority.get_role_info = "merchant.dev.yidian-inc.com/authority/authority/get_role_info"
-merchant.authority.update_role = "merchant.dev.yidian-inc.com/authority/authority/update_role"
-merchant.authority.delete_role = "merchant.dev.yidian-inc.com/authority/authority/delete_role"
-
-merchant.authority.get_user_list = "merchant.dev.yidian-inc.com/authority/authority/get_user_list"
-merchant.authority.get_user_info = "merchant.dev.yidian-inc.com/authority/authority/get_user_info"
-merchant.authority.update_user = "merchant.dev.yidian-inc.com/authority/authority/update_user"
-merchant.authority.add_user_role = "merchant.dev.yidian-inc.com/authority/authority/add_user_role"
+merchant.authority.get_role_list  = "http://merchant.dev.yidian-inc.com/authority/authority/get_role_list"
+merchant.authority.add_role  = "http://merchant.dev.yidian-inc.com/authority/authority/add_role"
+merchant.authority.role_list  = "http://merchant.dev.yidian-inc.com/authority/authority/role_list"
+merchant.authority.get_role_info = "http://merchant.dev.yidian-inc.com/authority/authority/get_role_info"
+merchant.authority.update_role = "http://merchant.dev.yidian-inc.com/authority/authority/update_role"
+merchant.authority.delete_role = "http://merchant.dev.yidian-inc.com/authority/authority/delete_role"
+
+merchant.authority.get_user_list = "http://merchant.dev.yidian-inc.com/authority/authority/get_user_list"
+merchant.authority.get_user_info = "http://merchant.dev.yidian-inc.com/authority/authority/get_user_info"
+merchant.authority.update_user = "http://merchant.dev.yidian-inc.com/authority/authority/update_user"
+merchant.authority.add_user_role = "http://merchant.dev.yidian-inc.com/authority/authority/add_user_role"
 
 ;后台op接口
-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.enterprise.life_list = "http://merchant.dev.yidian-inc.com/auth/enterprise/life_list"
+merchant.enterprise.life_info = "http://merchant.dev.yidian-inc.com/auth/enterprise/life_info"
+merchant.enterprise.op_commit = "http://merchant.dev.yidian-inc.com/auth/enterprise/op_commit"
+merchant.enterprise.op_business_update = "http://merchant.dev.yidian-inc.com/auth/enterprise/op_business_update"
+
+merchant.lifeaccount.get_account_by_lid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_account_by_lid"
 
-merchant.lifeaccount.get_account_by_lid = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_by_lid"
+merchant.lifeaccount.get_account_info = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info"
 
-merchant.lifeaccount.get_account_info = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info"
+merchant.lifeaccount.get_lid_by_uid = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
 
-merchant.lifeaccount.get_lid_by_uid = "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_ids = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
+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.update_life_account = "merchant.dev.yidian-inc.com/lifeaccount/account/update_life_account"
+merchant.lifeaccount.get_merchant_entrance  = "http://merchant.dev.yidian-inc.com/lifeaccount/account/get_merchant_entrance"
 
 ;互动项目
-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.is_follow = "interaction.dev.yidian-inc.com/follow/index/is_follow"
-interaction.inner.digg = "interaction.dev.yidian-inc.com/follow/index/digg"
-interaction.index.life_detail = "interaction.dev.yidian-inc.com/follow/index/get_count"
+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.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.get_count_and_isfollow = "http://interaction.dev.yidian-inc.com/follow/index/get_count_and_isfollow"
 
 ;门店
-goods.shop.add_shop = "goods.dev.yidian-inc.com/shop/shop/add_shop"
-goods.shop.get_shop_list = "goods.dev.yidian-inc.com/shop/shop/get_shop_list"
+goods.shop.add_shop = "http://goods.dev.yidian-inc.com/shop/shop/add_shop"
+goods.shop.get_shop_list = "http://goods.dev.yidian-inc.com/shop/shop/get_shop_list"
+goods.shop.get_shop_info = "http://goods.dev.yidian-inc.com/shop/shop/get_shop_info"
+goods.shop.update_shop = "http://goods.dev.yidian-inc.com/shop/shop/update_shop"
+goods.shop.shop_list = "http://goods.dev.yidian-inc.com/shop/shop/shop_list"
+
+
+
+;分销活动
+goods.marketing.marketing_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_list"
+goods.marketing.add_marketing = "http://goods.dev.yidian-inc.com/marketing/marketing/add_marketing"
+goods.marketing.update_marketing = "http://goods.dev.yidian-inc.com/marketing/marketing/update_marketing"
+goods.marketing.marketing_info = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_info"
+goods.marketing.marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/marketing_goods_list"
+goods.marketing.generate_share_goods = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/generate_share_goods"
+goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_list"
+
+
+
+;团长
+goods.marketing.second_distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/second_distributor_list"
+goods.marketing.apply_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/apply_distributor"
+goods.marketing.apply_second_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/apply_second_distributor"
+goods.marketing.send_sms_code = "http://goods.dev.yidian-inc.com/marketing/distributor/send_sms_code"
+goods.marketing.distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor"
+goods.marketing.distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/distributor_list"
+
+
 
 ;商品
 goods.public.get_goods_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_category_list"
@@ -308,48 +411,78 @@ goods.consumer.goods_info = "http://goods.dev.yidian-inc.com/goods/goods/info_fe
 goods.consumer.goods_add = "http://goods.dev.yidian-inc.com/goods/goods/add"
 
 
+;订单
+order.order.user_order_list = "http://order.dev.yidian-inc.com/order/order/user_order_list"
+order.order.merchant_order_list = "http://order.dev.yidian-inc.com/order/order/merchant_order_list"
+
 
 ; =======================  merchant ==================================================================================
 
 [prod-merchant : prod]
-[perf-goods : perf : prod-goods]
+[perf-merchant : perf : prod-merchant]
 [test-merchant : test]
 [dev-merchant : dev : test-merchant]
 
 
 
-; =======================  merchant ==================================================================================
+; =======================  goods ==================================================================================
 
 [prod-goods : prod]
 [perf-goods : perf : prod-goods]
 [test-goods : test]
+
+merchant.lifeaccount.get_life_account_by_ids = "http://merchant.test.yidian-inc.com/lifeaccount/account/get_life_account_by_ids"
+
 [dev-goods : dev : test-goods]
+goods.public.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"
 
 
+; =======================  order ==================================================================================
 
-; =======================  merchant ==================================================================================
+[prod-order : prod]
+[perf-order : perf : prod-order]
+[test-order : test]
 
-[prod-interaction : prod]
-merchant.account.get_role_list  = "merchant.int.yidian-inc.com/lifeaccount/account/get_role_list"
-merchant.account.get_life_list  = "merchant.int.yidian-inc.com/lifeaccount/account/get_life_list"
-merchant.account.get_user_list  = "merchant.int.yidian-inc.com/lifeaccount/account/get_user_list"
-service.jw_user.get_user_dynamic   = "testblend.jwshq.cn/ydInner/getUserListWithDynamic"
-service.jw_user.get_user_digg   = "testblend.jwshq.cn/ydInner/getUserAgreeCount"
+goods.shop.get_shop_list = "http://goods.test.int.yidian-inc.com/shop/shop/get_shop_list"
+goods.public.goods_sku_list = "http://goods.test.int.yidian-inc.com/goods/goods/goods_sku_list"
 
-[perf-goods : perf : prod-goods]
+[dev-order : dev : test-order]
+
+goods.shop.get_shop_list = "http://goods.dev.yidian-inc.com/shop/shop/get_shop_list"
+goods.public.goods_sku_list = "http://goods.dev.yidian-inc.com/goods/goods/goods_sku_list"
+
+; =======================  pay ==================================================================================
+
+[prod-pay : prod]
+[perf-pay : perf : prod-pay]
+[test-pay : test]
+[dev-pay : dev : test-pay]
+
+
+
+; =======================  interaction ==================================================================================
+
+[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_dynamic   = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
+service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
 
+[perf-interaction : perf : prod-interaction]
 
 [test-interaction : test]
-merchant.account.get_role_list  = "merchant.test.yidian-inc.com/lifeaccount/account/get_role_list"
-merchant.account.get_life_list  = "merchant.test.yidian-inc.com/lifeaccount/account/get_life_list"
-merchant.account.get_user_list  = "merchant.test.yidian-inc.com/lifeaccount/account/get_user_list"
-service.jw_user.get_user_dynamic   = "testblend.jwshq.cn/ydInner/getUserListWithDynamic"
-service.jw_user.get_user_digg   = "testblend.jwshq.cn/ydInner/getUserAgreeCount"
+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_dynamic   = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
+service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"
 
 [dev-interaction : dev]
-merchant.account.get_role_list  = "merchant.dev.yidian-inc.com/lifeaccount/account/get_role_list"
-merchant.account.get_life_list  = "merchant.dev.yidian-inc.com/lifeaccount/account/get_life_list"
-merchant.account.get_user_list  = "merchant.dev.yidian-inc.com/lifeaccount/account/get_user_list"
-service.jw_user.get_user_dynamic   = "testblend.jwshq.cn/ydInner/getUserListWithDynamic"
-service.jw_user.get_user_digg   = "testblend.jwshq.cn/ydInner/getUserAgreeCount"
+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_dynamic   = "http://testblend.jwshq.cn/ydInner/getUserListWithDynamic"
+service.jw_user.get_user_digg   = "http://testblend.jwshq.cn/ydInner/getUserAgreeCount"

mysql.ini

@@ -20,7 +20,7 @@ merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.
 [perf-merchant : prod-merchant : merchant : common]
 
 ; 测试环境
-[test-merchant : prod-merchant : merchant : common]
+[test-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
 merchant.connect_timeout=2
@@ -31,7 +31,7 @@ merchant.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
 merchant.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 联调环境
-[dev-merchant : prod-merchant : merchant : common]
+[dev-merchant : merchant : common]
 merchant.database_type='mysql'
 merchant.database_name='merchant'
 merchant.connect_timeout=2
@@ -41,6 +41,9 @@ merchant.charset='utf8mb4'
 merchant.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
+
+
+
 [interaction : common]
 ; 生产环境
 [prod-interaction : interaction : common]
@@ -50,14 +53,14 @@ interaction.connect_timeout=2
 interaction.username='bp_interaction_rw'
 interaction.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
 interaction.charset='utf8mb4'
-interaction.write.host='10.138.7.56:3306'
-interaction.read.host='10.138.7.57:3306,10.138.7.58:3306'
+interaction.write.host='w.bp_interaction.int.yidian-inc.com:3306'
+interaction.read.host='r.bp_interaction_1.int.yidian-inc.com:3306,r.bp_interaction_2.int.yidian-inc.com:3306'
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
 
 ; 测试环境
-[test-interaction : prod-interaction : interaction : common]
+[test-interaction : interaction : common]
 interaction.database_type='mysql'
 interaction.database_name='interaction'
 interaction.connect_timeout=2
@@ -68,7 +71,7 @@ interaction.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
 interaction.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
 
 ; 联调环境
-[dev-interaction : prod-interaction : interaction : common]
+[dev-interaction : interaction : common]
 interaction.database_type='mysql'
 interaction.database_name='interaction'
 interaction.connect_timeout=2
@@ -88,7 +91,7 @@ interaction.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysq
 [perf-goods : prod-goods : merchant : common]
 
 ; 测试环境
-[test-goods : prod-goods : merchant : common]
+[test-goods : merchant : common]
 goods.database_type='mysql'
 goods.database_name='goods'
 goods.connect_timeout=2
@@ -98,17 +101,17 @@ goods.charset='utf8mb4'
 goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
-distribution.database_type='mysql'
-distribution.database_name='distribution'
-distribution.connect_timeout=2
-distribution.username='bp_test_rw'
-distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
-distribution.charset='utf8mb4'
-distribution.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
-distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
-
-；开发联调测试
-[dev-goods : prod-goods : merchant : common]
+marketing.database_type='mysql'
+marketing.database_name='marketing'
+marketing.connect_timeout=2
+marketing.username='bp_test_rw'
+marketing.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+marketing.charset='utf8mb4'
+marketing.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+marketing.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
+; 开发联调测试
+[dev-goods : merchant : common]
 goods.database_type='mysql'
 goods.database_name='goods'
 goods.connect_timeout=2
@@ -118,14 +121,14 @@ goods.charset='utf8mb4'
 goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
 goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
-distribution.database_type='mysql'
-distribution.database_name='distribution'
-distribution.connect_timeout=2
-distribution.username='bp_test_rw'
-distribution.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
-distribution.charset='utf8mb4'
-distribution.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
-distribution.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+marketing.database_type='mysql'
+marketing.database_name='marketing'
+marketing.connect_timeout=2
+marketing.username='bp_test_rw'
+marketing.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+marketing.charset='utf8mb4'
+marketing.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+marketing.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
 [tcc : common]
 
@@ -143,3 +146,33 @@ tccIndex.read.host[]='r.bp_test_mysql5_1.int.yidian-inc.com:3310'
 tccIndex.read.host[]='r.bp_test_mysql5_2.int.yidian-inc.com:3310'
 
 [test-tcc : dev-tcc]
+
+
+[order : common]
+; 生产环境
+[prod-order : order : common]
+
+; 预发环境
+[perf-order : prod-order : order : common]
+
+; 测试环境
+[test-order : order : common]
+order.database_type='mysql'
+order.database_name='order'
+order.connect_timeout=2
+order.username='bp_test_rw'
+order.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+order.charset='utf8mb4'
+order.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
+order.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
+
+; 开发联调测试
+[dev-order : order : common]
+order.database_type='mysql'
+order.database_name='order'
+order.connect_timeout=2
+order.username='bp_test_rw'
+order.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+order.charset='utf8mb4'
+order.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+order.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'

redis.ini

@@ -67,17 +67,10 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
-countConnect.mode='codis'
-countConnect.topom='http://10.126.165.6:18080/topom'
-countConnect.fallback=''
-countConnect.password=''
-countConnect.select=0
-countConnect.timeout=1
-countConnect.serializer='none'
-countConnect.prefix=''
-
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
 
+[test-interaction : test-merchant : prod-merchant : merchant : common]
+
 [dev-interaction : test-merchant : prod-merchant : merchant : common]
 
 [prod-interaction : prod-merchant : merchant : common]
@@ -90,4 +83,34 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
-[pre-interaction : prod-interaction : prod-merchant : merchant : common]
+[pref-interaction : prod-interaction : prod-merchant : merchant : common]
\ No newline at end of file
+
+
+
+
+
+[goods : common]
+
+[prod-goods : goods : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18136/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+ 
+
+[perf-goods : goods : common]
+[test-goods : goods : common]
+;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
+cacheConnect.mode='codis'
+cacheConnect.topom='http://10.126.165.6:18080/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+[dev-goods : test-goods : goods : common]

xhprof.ini

 [common]
+# 对应的域名是否使用当前域名作为 collection 1：开启，0:不开启
+collection.bp_test_go2yd_com = 1
 
-domain.bp_test_go2yd_com = 1
-domain.localhost         = 1
-
-
-[test-gateway : common]
+#是否开启xhprof, 按照域名来开启， 值为开启的百分比
+switch.bp_test_go2yd_com = 100
\ No newline at end of file