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

interface.ini

@@ -28,6 +28,8 @@ service.session.mget            = "http://a4-1.go2yd.com/Website/session/get-man
 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"
+service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
+
 
 ;用户审核相关接口
 merchant.personal.check = "merchant.test.yidian-inc.com/auth/personal/check"
@@ -53,6 +55,20 @@ merchant.enterprise.get_record_info   = "merchant.test.yidian-inc.com/auth/enter
 
 ;管理员用户权限相关接口
 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"
+merchant.authority.role_list  = "merchant.test.yidian-inc.com/authority/authority/role_list"
+merchant.authority.get_role_info = "merchant.test.yidian-inc.com/authority/authority/get_role_info"
+merchant.authority.update_role = "merchant.test.yidian-inc.com/authority/authority/update_role"
+
+merchant.authority.get_user_list = "merchant.test.yidian-inc.com/authority/authority/get_user_list"
+merchant.authority.get_user_info = "merchant.test.yidian-inc.com/authority/authority/get_user_info"
+merchant.authority.update_user = "merchant.test.yidian-inc.com/authority/authority/update_user"
+
+
+;后台op接口
+merchant.enterprise.life_list = "http://merchant.test.yidian-inc.com/auth/enterprise/life_list"
+merchant.enterprise.life_info = "http://merchant.test.yidian-inc.com/auth/enterprise/life_info"
+
 
 [merchant : common]
 [test-merchant : merchant : common]
@@ -60,6 +76,8 @@ merchant.authority.get_role_list  = "merchant.test.yidian-inc.com/authority/auth
 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"
+service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
+
 
 ;idgen发号器
 service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
\ No newline at end of file

merchant.ini

+[common]
+;一个人最多可以有多少个人生活号
+life_account_count.personal         = 2;
+;一个人最多可以有多少企业生活号
+life_account_count.enterprise       = 3;
+;一个人最多可以有多少生活号
+life_account_count.all              = 5;
+;一个企业商户最多可以有多少生活号
+merchant_enterprise.life_account_count = 9999
+;一个人在同一企业最多可以有多少生活号
+life_account_count.same_enterprise  = 1
+;一个人在同一个人商户最多可以有多少生活号
+life_account_count.same_personal  = 1
+
+[test-merchant : common]