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

interface.ini

+[common]
+
+;敏感词
+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"
+;短信 
+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?"
+
+[gateway : common]
+
+
+[prod-gateway : gateway : common]
+[perf-gateway : gateway : common]
+[test-gateway : gateway : common]
+
+service.session.get             = "http://a4-1.go2yd.com/Website/session/get-session"
+service.session.set             = "http://a4-1.go2yd.com/Website/session/set-session"
+service.session.delete          = "http://a4-1.go2yd.com/Website/session/delete-session"
+service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-many-session"
+
+;简网用户信息
+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"
+
+;idgen发号器
+service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
\ No newline at end of file