Commit 3eb458ae authored by jianghaiming's avatar jianghaiming

update:修改

parents 88b5205c 73ad5f7d
...@@ -62,6 +62,9 @@ merchant.enterprise.change_role = "merchant.test.yidian-inc.com/auth/enterpris ...@@ -62,6 +62,9 @@ merchant.enterprise.change_role = "merchant.test.yidian-inc.com/auth/enterpris
merchant.enterprise.delete_life_user = "merchant.test.yidian-inc.com/auth/enterprise/delete_life_user" merchant.enterprise.delete_life_user = "merchant.test.yidian-inc.com/auth/enterprise/delete_life_user"
merchant.recruit.create_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/create_recruit"
merchant.recruit.update_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/update_recruit"
merchant.recruit.get_recruit = "merchant.test.yidian-inc.com/lifeaccount/recruit/get_recruit"
merchant.enterprise.send_code = "merchant.test.yidian-inc.com/auth/verify/send_code" merchant.enterprise.send_code = "merchant.test.yidian-inc.com/auth/verify/send_code"
merchant.enterprise.check_code = "merchant.test.yidian-inc.com/auth/verify/check_code" merchant.enterprise.check_code = "merchant.test.yidian-inc.com/auth/verify/check_code"
...@@ -85,7 +88,7 @@ merchant.authority.add_user_role = "merchant.test.yidian-inc.com/authority/autho ...@@ -85,7 +88,7 @@ merchant.authority.add_user_role = "merchant.test.yidian-inc.com/authority/autho
;后台op接口 ;后台op接口
merchant.enterprise.life_list = "merchant.test.yidian-inc.com/auth/enterprise/life_list" merchant.enterprise.life_list = "merchant.test.yidian-inc.com/auth/enterprise/life_list"
merchant.enterprise.life_info = "merchant.test.yidian-inc.com/auth/enterprise/life_info" merchant.enterprise.life_info = "merchant.test.yidian-inc.com/auth/enterprise/life_info"
merchant.enterprise.op_commit = "merchant.test.yidian-inc.com/auth/enterprise/op_commit"
[dev-gateway : test-gateway : gateway : common] [dev-gateway : test-gateway : gateway : common]
...@@ -109,11 +112,15 @@ merchant.enterprise.audit = "merchant.dev.yidian-inc.com/auth/enterpri ...@@ -109,11 +112,15 @@ merchant.enterprise.audit = "merchant.dev.yidian-inc.com/auth/enterpri
merchant.enterprise.audit_list = "merchant.dev.yidian-inc.com/auth/enterprise/audit_list" 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.add_user = "merchant.dev.yidian-inc.com/auth/enterprise/add_user"
merchant.enterprise.complete = "merchant.dev.yidian-inc.com/auth/enterprise/complete" 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_record_info = "merchant.test.yidian-inc.com/auth/enterprise/get_record_info"
merchant.enterprise.get_log = "merchant.test.yidian-inc.com/auth/enterprise/get_log"
merchant.enterprise.get_account_role_list = "merchant.dev.yidian-inc.com/auth/enterprise/get_account_role_list" merchant.enterprise.get_account_role_list = "merchant.dev.yidian-inc.com/auth/enterprise/get_account_role_list"
merchant.enterprise.send_code = "merchant.dev.yidian-inc.com/auth/verify/send_code" merchant.enterprise.send_code = "merchant.dev.yidian-inc.com/auth/verify/send_code"
merchant.enterprise.check_code = "merchant.dev.yidian-inc.com/auth/verify/check_code" merchant.enterprise.check_code = "merchant.dev.yidian-inc.com/auth/verify/check_code"
merchant.recruit.create_recruit = "merchant.dev.yidian-inc.com/lifeaccount/recruit/create_recruit"
merchant.recruit.update_recruit = "merchant.dev.yidian-inc.com/lifeaccount/recruit/update_recruit"
merchant.recruit.get_recruit = "merchant.dev.yidian-inc.com/lifeaccount/recruit/get_recruit"
;管理员用户权限相关接口 ;管理员用户权限相关接口
merchant.authority.get_role_list = "merchant.dev.yidian-inc.com/authority/authority/get_role_list" merchant.authority.get_role_list = "merchant.dev.yidian-inc.com/authority/authority/get_role_list"
...@@ -133,7 +140,7 @@ merchant.authority.add_user_role = "merchant.dev.yidian-inc.com/authority/author ...@@ -133,7 +140,7 @@ merchant.authority.add_user_role = "merchant.dev.yidian-inc.com/authority/author
;后台op接口 ;后台op接口
merchant.enterprise.life_list = "merchant.dev.yidian-inc.com/auth/enterprise/life_list" merchant.enterprise.life_list = "merchant.dev.yidian-inc.com/auth/enterprise/life_list"
merchant.enterprise.life_info = "merchant.dev.yidian-inc.com/auth/enterprise/life_info" merchant.enterprise.life_info = "merchant.dev.yidian-inc.com/auth/enterprise/life_info"
merchant.enterprise.op_commit = "merchant.dev.yidian-inc.com/auth/enterprise/op_commit"
......
...@@ -25,5 +25,4 @@ gateway.uriOptions.wTimeoutMS=3000 ...@@ -25,5 +25,4 @@ gateway.uriOptions.wTimeoutMS=3000
gateway.driverOptions.typeMap.root='array' gateway.driverOptions.typeMap.root='array'
gateway.driverOptions.typeMap.document='array' gateway.driverOptions.typeMap.document='array'
[dev-gateway : test-gateway : prod-gateway : gateway : common] [dev-gateway : test-gateway : prod-gateway : gateway : common]
\ No newline at end of file
...@@ -31,3 +31,25 @@ merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ' ...@@ -31,3 +31,25 @@ merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
merchant.charset='utf8mb4' merchant.charset='utf8mb4'
merchant.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306' merchant.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306' merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
; 测试环境
[test-interaction : prod-interaction : interaction : common]
merchant.database_type='mysql'
merchant.database_name='interaction'
merchant.connect_timeout=10
merchant.username='bp_test_rw'
merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
merchant.charset='utf8mb4'
merchant.write.host='w.bp_test_mysql4.int.yidian-inc.com:3309'
merchant.read.host='r.bp_test_mysql4_1.int.yidian-inc.com:3309,r.bp_test_mysql4_2.int.yidian-inc.com:3309'
; 联调环境
[dev-interaction : prod-interaction : interaction : common]
merchant.database_type='mysql'
merchant.database_name='interaction'
merchant.connect_timeout=10
merchant.username='bp_test_rw'
merchant.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
merchant.charset='utf8mb4'
merchant.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
\ No newline at end of file
[common]
[gateway : common]
[prod-gateway : gateway : common]
[perf-gateway : gateway : common]
[test-gateway : gateway : common]
;codis表示集群业务名,mode表示连接数据源的模式(包括codis|sentinel|redis),serializer表示自动序列化方式(包括none|php|igbinary)
cacheConnect.mode='codis'
cacheConnect.topom='http://10.126.165.6:18080/topom'
cacheConnect.fallback=''
cacheConnect.password=''
cacheConnect.select=0
cacheConnect.timeout=1
cacheConnect.serializer='none'
cacheConnect.prefix=''
[dev-gateway : test-gateway : gateway : common]
;商户项目配置
;商户项目继承common + 自己的配置,此节中配置会覆盖父级的相同配置(不区分环境)
[merchant : common]
;商户项目继承common + 自己的配置 + 生产环境特有有配置,此节中配置会覆盖父级的相同配置
[prod-merchant : merchant : common]
;商户项目继承common + 自己的配置 + 测试环境特有有配置,此节中配置会覆盖父级的相同配置
[perf-merchant : prod-merchant : merchant : common]
[test-merchant : prod-merchant : merchant : common]
;codis表示集群业务名,mode表示连接数据源的模式(包括codis|sentinel|redis),serializer表示自动序列化方式(包括none|php|igbinary)
cacheConnect.mode='codis'
cacheConnect.topom='http://10.126.165.6:18080/topom'
cacheConnect.fallback=''
cacheConnect.password=''
cacheConnect.select=0
cacheConnect.timeout=1
cacheConnect.serializer='none'
cacheConnect.prefix=''
[dev-merchant : test-merchant : prod-merchant : merchant : common]
[dev-interaction : test-merchant : prod-merchant : merchant : common]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment