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

interface.ini

@@ -4,8 +4,17 @@
 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]
+;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"
+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"
+
 
 [gateway : common]
 
@@ -14,14 +23,13 @@ service.user.send_sms_code           = "http://a4-1.go2yd.com/Website/user/send-
 [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"
+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"
@@ -31,6 +39,41 @@ merchant.personal.authentication = "merchant.test.yidian-inc.com/auth/personal/a
 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.enterprise.ent_check        = "merchant.test.yidian-inc.com/auth/enterprise/ent_check"
+merchant.enterprise.ent_commit       = "merchant.test.yidian-inc.com/auth/enterprise/ent_commit"
+merchant.enterprise.legal_commit     = "merchant.test.yidian-inc.com/auth/enterprise/legal_commit"
+merchant.enterprise.ent_personal     = "merchant.test.yidian-inc.com/auth/enterprise/ent_personal"
+merchant.enterprise.live_identity    = "merchant.test.yidian-inc.com/auth/enterprise/live_identity"
+merchant.enterprise.check_life      = "merchant.test.yidian-inc.com/auth/enterprise/check_life"
+merchant.enterprise.create_life      = "merchant.test.yidian-inc.com/auth/enterprise/create_life"
+merchant.enterprise.audit           = "merchant.test.yidian-inc.com/auth/enterprise/audit"
+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.enterprise.complete         = "merchant.test.yidian-inc.com/auth/enterprise/complete"
+merchant.enterprise.get_record_info   = "merchant.test.yidian-inc.com/auth/enterprise/get_record_info"
+merchant.enterprise.get_account_role_list   = "merchant.test.yidian-inc.com/auth/enterprise/get_account_role_list"
+
+
+;管理员用户权限相关接口
+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"
+merchant.authority.add_user_role = "merchant.test.yidian-inc.com/authority/authority/add_user_role"
+
+
+;后台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"
+
+
+
 [dev-gateway : test-gateway : gateway : common]
 ;用户审核相关接口
 merchant.personal.check = "merchant.dev.yidian-inc.com/auth/personal/check"
@@ -40,12 +83,51 @@ merchant.personal.authentication = "merchant.dev.yidian-inc.com/auth/personal/au
 merchant.life_account.create_unauthorized = "merchant.dev.yidian-inc.com/lifeaccount/account/create_unauthorized"
 merchant.user.life_account_list = "merchant.dev.yidian-inc.com/user/user/account_list"
 
+;企业审核相关接口
+merchant.enterprise.ent_check        = "merchant.dev.yidian-inc.com/auth/enterprise/ent_check"
+merchant.enterprise.ent_commit       = "merchant.dev.yidian-inc.com/auth/enterprise/ent_commit"
+merchant.enterprise.legal_commit     = "merchant.dev.yidian-inc.com/auth/enterprise/legal_commit"
+merchant.enterprise.ent_personal     = "merchant.dev.yidian-inc.com/auth/enterprise/ent_personal"
+merchant.enterprise.live_identity    = "merchant.dev.yidian-inc.com/auth/enterprise/live_identity"
+merchant.enterprise.check_life      = "merchant.dev.yidian-inc.com/auth/enterprise/check_life"
+merchant.enterprise.create_life      = "merchant.dev.yidian-inc.com/auth/enterprise/create_life"
+merchant.enterprise.audit           = "merchant.dev.yidian-inc.com/auth/enterprise/audit"
+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.dev.yidian-inc.com/auth/enterprise/get_record_info"
+merchant.enterprise.get_account_role_list   = "merchant.dev.yidian-inc.com/auth/enterprise/get_account_role_list"
+
+
+;管理员用户权限相关接口
+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"
+merchant.authority.role_list  = "merchant.dev.yidian-inc.com/authority/authority/role_list"
+merchant.authority.get_role_info = "merchant.dev.yidian-inc.com/authority/authority/get_role_info"
+merchant.authority.update_role = "merchant.dev.yidian-inc.com/authority/authority/update_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 = "http://merchant.dev.yidian-inc.com/auth/enterprise/life_list"
+merchant.enterprise.life_info = "http://merchant.dev.yidian-inc.com/auth/enterprise/life_info"
+
+
+
+
 
 [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"
+service.jw_user.get_user_list   = "http://testblend.jwshq.cn/ydInner/getUserList"
+
 
 ;idgen发号器
 service.idgen = "idgen-test.ini.yidian-inc.com/id/get"

merchant.ini

+[common]
+;一个人最多可以有多少个人生活号
+life_account_count.personal         = 1;
+;一个人最多可以有多少企业生活号
+life_account_count.enterprise       = 1;
+;一个人最多可以有多少生活号
+life_account_count.all              = 1;
+;一个企业商户最多可以有多少生活号
+merchant_enterprise.life_account_count = 9999
+;一个人在同一企业最多可以有多少生活号
+life_account_count.same_enterprise  = 1
+;一个人在同一个人商户最多可以有多少生活号
+life_account_count.same_personal  = 1
+
+[test-merchant : common]
\ No newline at end of file