update:处理冲突

interface.ini

@@ -3,12 +3,28 @@
 ;敏感词
 service.sensitive.detect             = "http://barrage.int.yidian-inc.com/sensitive/detection/detect"
 service.sensitive.detect_batch       = "http://barrage.int.yidian-inc.com/sensitive/detection/detectBatch"
+
+
+[prod : common]
+
+;短信 
+service.user.check_sms_code          = "http://a4.go2yd.com/Website/user/check-sms-code"
+service.user.send_sms_code           = "http://a4.go2yd.com/Website/user/send-sms-code"
+service.message.send_sms             = "http://a4.go2yd.com/Website/message/send-sms"
+
+;session相关
+service.session.get             = "http://a4.go2yd.com/Website/session/get-session"
+service.session.set             = "http://a4.go2yd.com/Website/session/set-session"
+service.session.delete          = "http://a4.go2yd.com/Website/session/delete-session"
+service.session.mget            = "http://a4.go2yd.com/Website/session/get-many-session"
+
+[test : common]
+
 ;短信 
 service.user.check_sms_code          = "http://a4-1.go2yd.com/Website/user/check-sms-code"
 service.user.send_sms_code           = "http://a4-1.go2yd.com/Website/user/send-sms-code"
 service.message.send_sms             = "http://a4-1.go2yd.com/Website/message/send-sms"
 
-[test : common]
 ;session相关
 service.session.get             = "http://a4-1.go2yd.com/Website/session/get-session"
 service.session.set             = "http://a4-1.go2yd.com/Website/session/set-session"
@@ -22,6 +38,96 @@ service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-man
 
 
 [prod-gateway : gateway : common]
+
+;简网用户信息
+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.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.user.binding_location = "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.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"
+
+
+;后台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.lifeaccount.get_account_by_lid = "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"
+
+;互动项目
+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/life_detail"
+
+
+
+
 [perf-gateway : gateway : common]
 [test-gateway : gateway : common]
 
@@ -76,8 +182,6 @@ merchant.recruitinner.get_recruit  = "merchant.test.yidian-inc.com/lifeaccount/r
 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.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"
@@ -102,20 +206,19 @@ merchant.lifeaccount.get_account_by_lid = "merchant.test.yidian-inc.com/lifeacco
 
 merchant.lifeaccount.get_account_info = "merchant.test.yidian-inc.com/lifeaccount/account/get_account_info"
 
+merchant.lifeaccount.get_lid_by_uid = "merchant.test.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
+
 ;互动项目
 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]
 ;用户审核相关接口
 merchant.personal.check = "merchant.dev.yidian-inc.com/auth/personal/check"
@@ -140,12 +243,17 @@ merchant.enterprise.audit           = "merchant.dev.yidian-inc.com/auth/enterpri
 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.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_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"
@@ -154,7 +262,6 @@ merchant.recruitinner.create_recruit  = "merchant.dev.yidian-inc.com/lifeaccount
 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"
@@ -163,13 +270,11 @@ merchant.authority.get_role_info = "merchant.dev.yidian-inc.com/authority/author
 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"
 
-
 ;后台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"
@@ -180,31 +285,33 @@ merchant.lifeaccount.get_account_by_lid = "merchant.dev.yidian-inc.com/lifeaccou
 
 merchant.lifeaccount.get_account_info = "merchant.dev.yidian-inc.com/lifeaccount/account/get_account_info"
 
+merchant.lifeaccount.get_lid_by_uid = "merchant.dev.yidian-inc.com/lifeaccount/account/get_lid_by_uid"
+
 ;互动项目
 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"
 
 ;商品
-goods.public.get_goods_category_list = "goods.com/goods/goods/get_goods_category_list"
-goods.public.goods_edit = "goods.com/goods/goods/edit"
-goods.public.goods_online_offline = "goods.com/goods/goods/online_offline"
-goods.public.check_goods_name = "goods.com/goods/goods/check_goods_name"
+goods.public.get_goods_category_list = "http://goods.dev.yidian-inc.com/goods/goods/get_goods_category_list"
+goods.public.goods_edit = "http://goods.dev.yidian-inc.com/goods/goods/edit"
+goods.public.goods_online_offline = "http://goods.dev.yidian-inc.com/goods/goods/online_offline"
+goods.public.check_goods_name = "http://goods.dev.yidian-inc.com/goods/goods/check_goods_name"
 
-goods.background.goods_list_op = "goods.com/goods/goods/goods_list_op"
-goods.background.goods_info_op = "goods.com/goods/goods/info_op"
-goods.background.goods_audit = "goods.com/goods/goods/audit"
+goods.background.goods_list_op = "http://goods.dev.yidian-inc.com/goods/goods/goods_list_op"
+goods.background.goods_info_op = "http://goods.dev.yidian-inc.com/goods/goods/info_op"
+goods.background.goods_audit = "http://goods.dev.yidian-inc.com/goods/goods/audit"
 
-goods.consumer.goods_list_c = "goods.com/goods/goods/goods_list_c"
-goods.consumer.goods_list_es = "goods.com/goods/goods/goods_list_es"
-goods.consumer.goods_info = "goods.com/goods/goods/info_fe"
-goods.consumer.goods_add = "goods.com/goods/goods/add"
+goods.consumer.goods_list_c = "http://goods.dev.yidian-inc.com/goods/goods/goods_list_c"
+goods.consumer.goods_list_es = "http://goods.dev.yidian-inc.com/goods/goods/goods_list_es"
+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"
 
 
 [merchant : common]
@@ -231,9 +338,23 @@ service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
 [dev-goods : test-goods : goods : common]
 
 [interaction:common]
+[prod-interaction : interaction : common]
+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"
+
 [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"
+service.jw_user.get_user_digg   = "testblend.jwshq.cn/ydInner/getUserAgreeCount"
+
 [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"
\ No newline at end of file
+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"

mongo.ini

@@ -7,6 +7,31 @@
 
 ;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
 [prod-gateway : gateway : common]
+gateway.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+gateway.uriOptions.username='rs_merchant_rw'
+gateway.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
+gateway.uriOptions.replicaSet='rs_bp'
+gateway.uriOptions.readPreference='secondaryPreferred'
+gateway.uriOptions.connectTimeoutMS=500
+gateway.uriOptions.socketTimeoutMS=6000
+gateway.uriOptions.w=1
+gateway.uriOptions.wTimeoutMS=3000
+gateway.driverOptions.typeMap.root='array'
+gateway.driverOptions.typeMap.document='array'
+ 
+
+xhprof.host="rs_bp_merchant_01.int.yidian-inc.com:27107,rs_bp_merchant_02.int.yidian-inc.com:27107,rs_bp_merchant_03.int.yidian-inc.com:27107"
+xhprof.uriOptions.username='rs_merchant_rw'
+xhprof.uriOptions.password='w#JR9tQOVud$jh43V7v#B9Bd#kD4w%'
+xhprof.uriOptions.replicaSet='rs_bp'
+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'
+
 
 ;商户项目继承common + 自己的配置 + 测试环境特有有配置，此节中配置会覆盖父级的相同配置
 [perf-gateway : prod-gateway : gateway : common]

mysql.ini

@@ -6,6 +6,15 @@
 
 ; 生产环境
 [prod-merchant : merchant : common]
+merchant.database_type='mysql'
+merchant.database_name='merchant'
+merchant.connect_timeout=10
+merchant.username='bp_merchant_rw'
+merchant.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+merchant.charset='utf8mb4'
+merchant.write.host='w.bp_merchant.int.yidian-inc.com:3306'
+merchant.read.host='r.bp_merchant_1.int.yidian-inc.com:3306,r.bp_merchant_2.int.yidian-inc.com:3306'
+
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
@@ -32,27 +41,42 @@ 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]
+interaction.database_type='mysql'
+interaction.database_name='interaction'
+interaction.connect_timeout=10
+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'
+
+; 预发环境
+[perf-merchant : prod-merchant : merchant : common]
+
 ; 测试环境
 [test-interaction : prod-interaction : interaction : common]
-merchant.database_type='mysql'
-merchant.database_name='interaction'
-merchant.connect_timeout=10
-merchant.username='bp_test_rw'
-merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
-merchant.charset='utf8mb4'
-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'
+interaction.database_type='mysql'
+interaction.database_name='interaction'
+interaction.connect_timeout=10
+interaction.username='bp_test_rw'
+interaction.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+interaction.charset='utf8mb4'
+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]
-merchant.database_type='mysql'
-merchant.database_name='interaction'
-merchant.connect_timeout=10
-merchant.username='bp_test_rw'
-merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
-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.database_type='mysql'
+interaction.database_name='interaction'
+interaction.connect_timeout=10
+interaction.username='bp_test_rw'
+interaction.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+interaction.charset='utf8mb4'
+interaction.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+interaction.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
 
 
 [goods : common]
@@ -74,6 +98,15 @@ 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=10
+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]
 goods.database_type='mysql'
@@ -83,4 +116,30 @@ 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'
\ No newline at end of file
+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=10
+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'
+
+[tcc : common]
+
+[prod-tcc : tcc : common]
+
+[dev-tcc : prod-tcc : tcc : common]
+tccIndex.database_type='mysql'
+tccIndex.database_name='bp_tcc'
+tccIndex.connect_timeout=10
+tccIndex.username='bp_test_rw'
+tccIndex.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+tccIndex.charset='utf8'
+tccIndex.write.host='w.bp_test_mysql5.int.yidian-inc.com:3310'
+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]
\ No newline at end of file

redis.ini

@@ -3,6 +3,16 @@
 [gateway : common]
 
 [prod-gateway : gateway : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18134/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+ 
+
 [perf-gateway : gateway : common]
 [test-gateway : gateway : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
@@ -25,6 +35,24 @@ cacheConnect.prefix=''
 
 ;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
 [prod-merchant : merchant : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18135/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18138/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 
 ;商户项目继承common + 自己的配置 + 测试环境特有有配置，此节中配置会覆盖父级的相同配置
 [perf-merchant : prod-merchant : merchant : common]
@@ -51,3 +79,15 @@ countConnect.prefix=''
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
 
 [dev-interaction : test-merchant : prod-merchant : merchant : common]
+
+[prod-interaction : prod-merchant : merchant : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18139/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='none'
+cacheConnect.prefix=''
+
+[pre-interaction : prod-interaction : prod-merchant : merchant : common]
\ No newline at end of file