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

interface.ini

@@ -27,11 +27,11 @@ service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-man
 
 
 ;简网用户信息
-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.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"
 
 ;用户审核相关接口
 merchant.personal.check = "merchant.test.yidian-inc.com/auth/personal/check"
@@ -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"
@@ -66,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.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"
 
@@ -89,6 +96,25 @@ 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"
+
+merchant.lifeaccount.get_account_info = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_info"
+
+;互动项目
+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"
+interaction.inner.digg = "interaction.test.yidian-inc.com/follow/index/digg"
+interaction.index.life_detail = "interaction.test.yidian-inc.com/follow/index/life_detail"
+
+
+;门店
+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"
+
 
 
 [dev-gateway : test-gateway : gateway : common]
@@ -100,6 +126,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"
@@ -118,10 +147,24 @@ merchant.enterprise.get_account_role_list   = "merchant.dev.yidian-inc.com/auth/
 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.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 +184,23 @@ 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"
+
+merchant.lifeaccount.get_account_info = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info"
+
+;互动项目
+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.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/life_detail"
+
+;门店
+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"
 
 
 
@@ -148,11 +208,11 @@ merchant.enterprise.op_commit = "merchant.dev.yidian-inc.com/auth/enterprise/op_
 [merchant : common]
 [test-merchant : merchant : common]
 ;简网用户信息
-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.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"
 
 ;idgen发号器
 service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
@@ -166,4 +226,19 @@ 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]
+[dev-goods : test-goods : goods : common]
\ No newline at end of file
+
+[interaction:common]
+[test-interaction : interaction : common]
+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"
+
+[dev-interaction : test-interaction : interaction : common]
+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"

mongo.ini

@@ -25,4 +25,17 @@ gateway.uriOptions.wTimeoutMS=3000
 gateway.driverOptions.typeMap.root='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]
\ No newline at end of file

mysql.ini

@@ -63,6 +63,17 @@ merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_
 ; 预发环境
 [perf-goods : prod-goods : merchant : common]
 
+；测试环境
+[test-goods : prod-goods : merchant : common]
+goods.database_type='mysql'
+goods.database_name='goods'
+goods.connect_timeout=10
+goods.username='bp_test_rw'
+goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+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'
+
 ；开发联调测试
 [dev-goods : prod-goods : merchant : common]
 goods.database_type='mysql'

redis.ini

@@ -39,6 +39,15 @@ 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]
 
 [dev-interaction : test-merchant : prod-merchant : merchant : common]

xhprof.ini

+[common]
+
+domain.bp_test_go2yd_com = 1
+domain.localhost         = 1
+
+
+[test-gateway : common]
\ No newline at end of file