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

README.md

-商户系统相关的yaconf配置文件
+## 商户系统相关的yaconf配置文件
\ No newline at end of file
+
+
+

interface.ini

@@ -28,8 +28,20 @@ service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-man
 service.jw_user.get_user_info       = "http://10.9.146.155:8100/ydInner/getUserInfoByMobile"
 service.jw_user.get_all_city_tree   = "http://10.9.146.155:8100/ydInner/getAllCityTree"
 
+;用户审核相关接口
+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 : common]
 [test-merchant : merchant : common]
 ;简网用户信息
 service.jw_user.get_user_info       = "http://10.9.146.155:8100/ydInner/getUserInfoByMobile"
-service.jw_user.get_all_city_tree   = "http://10.9.146.155:8100/ydInner/getAllCityTree"
+service.jw_user.get_all_city_tree   = "http://10.9.146.155:8100/ydInner/getAllCityTree"
\ No newline at end of file
+
+;idgen发号器
+service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
\ No newline at end of file

mongo.ini

+[common]
+
+
+;商户项目配置
+;商户项目继承common + 自己的配置，此节中配置会覆盖父级的相同配置（不区分环境）
+[merchant : common]
+
+;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
+[prod-merchant : merchant : common]
+
+;商户项目继承common + 自己的配置 + 测试环境特有有配置，此节中配置会覆盖父级的相同配置
+[perf-merchant : prod-merchant : merchant : common]
+[test-merchant : prod-merchant : merchant : common]
+merchant.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"
+merchant.uriOptions.username='rs_bp_test_rw'
+merchant.uriOptions.password='uE5bLz9#GSHXzhuaAeTDqll65mM@XC'
+merchant.uriOptions.replicaSet='rs_bp_test'
+merchant.uriOptions.readPreference='secondaryPreferred'
+merchant.uriOptions.connectTimeoutMS=500
+merchant.uriOptions.socketTimeoutMS=6000
+merchant.uriOptions.w=1
+merchant.uriOptions.wTimeoutMS=3000
+merchant.driverOptions.typeMap.root='array'
+merchant.driverOptions.typeMap.document='array'