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
\ No newline at end of file

interface.ini

@@ -48,6 +48,7 @@ service.jw_user.get_all_city_tree   = "http://testblend.jwshq.cn/ydInner/getAllC
 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 = "http://idgen-test.ini.yidian-inc.com/id/get"
@@ -305,6 +306,8 @@ merchant.recruitinner.create_recruit  = "http://merchant.dev.yidian-inc.com/life
 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  = "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"

mysql.ini

@@ -44,7 +44,6 @@ merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_
 
 
 
-
 [interaction : common]
 ; 生产环境
 [prod-interaction : interaction : common]

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]