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

interface.ini

@@ -4,8 +4,8 @@
 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?"
+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"
 
 
 [test : common]
@@ -25,8 +25,9 @@ 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"
+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"
 
 ;用户审核相关接口
 merchant.personal.check = "merchant.test.yidian-inc.com/auth/personal/check"
@@ -48,13 +49,15 @@ merchant.enterprise.audit           = "merchant.test.yidian-inc.com/auth/enterpr
 merchant.enterprise.audit_list      = "merchant.test.yidian-inc.com/auth/enterprise/audit_list"
 merchant.enterprise.add_user         = "merchant.test.yidian-inc.com/auth/enterprise/add_user"
 
-
+;管理员用户权限相关接口
+merchant.authority.get_role_list  = "merchant.test.yidian-inc.com/authority/authority/get_role_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_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"
 
 ;idgen发号器
 service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
\ No newline at end of file