update:处理冲突

interface.ini

@@ -42,25 +42,30 @@ merchant.life_account.create_unauthorized = "merchant.test.yidian-inc.com/lifeac
 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_log   = "merchant.test.yidian-inc.com/auth/enterprise/get_log"
+merchant.enterprise.ent_check           = "merchant.test.yidian-inc.com/auth/enterprise/check"
+merchant.enterprise.ent_commit          = "merchant.test.yidian-inc.com/auth/enterprise/business"
+merchant.enterprise.legal_commit        = "merchant.test.yidian-inc.com/auth/enterprise/legal"
+merchant.enterprise.ent_personal        = "merchant.test.yidian-inc.com/auth/enterprise/employed"
+merchant.enterprise.live_identity       = "merchant.test.yidian-inc.com/auth/enterprise/live"
+merchant.enterprise.check_life          = "merchant.test.yidian-inc.com/auth/enterprise/check_life"
+merchant.enterprise.create_life         = "merchant.test.yidian-inc.com/auth/enterprise/employed_complate"
+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_log             = "merchant.test.yidian-inc.com/auth/enterprise/get_log"
 merchant.enterprise.get_account_role_list   = "merchant.test.yidian-inc.com/auth/enterprise/get_account_role_list"
 merchant.enterprise.send_mobile_code   = "merchant.test.yidian-inc.com/auth/enterprise/send_mobile_code"
 merchant.enterprise.check_mobile_code   = "merchant.test.yidian-inc.com/auth/enterprise/check_mobile_code"
 merchant.enterprise.change_role   = "merchant.test.yidian-inc.com/auth/enterprise/change_role"
+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.check_code   = "merchant.test.yidian-inc.com/auth/verify/check_code"
 
@@ -83,7 +88,7 @@ merchant.authority.add_user_role = "merchant.test.yidian-inc.com/authority/autho
 ;后台op接口
 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.op_commit = "merchant.test.yidian-inc.com/auth/enterprise/op_commit"
 
 
 [dev-gateway : test-gateway : gateway : common]
@@ -96,22 +101,26 @@ merchant.life_account.create_unauthorized = "merchant.dev.yidian-inc.com/lifeacc
 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.ent_check        = "merchant.dev.yidian-inc.com/auth/enterprise/check"
+merchant.enterprise.ent_commit       = "merchant.dev.yidian-inc.com/auth/enterprise/business"
+merchant.enterprise.legal_commit     = "merchant.dev.yidian-inc.com/auth/enterprise/legal"
+merchant.enterprise.ent_personal     = "merchant.dev.yidian-inc.com/auth/enterprise/employed"
+merchant.enterprise.live_identity    = "merchant.dev.yidian-inc.com/auth/enterprise/live"
 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.create_life      = "merchant.dev.yidian-inc.com/auth/enterprise/employed_complate"
 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_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.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.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"
@@ -131,7 +140,7 @@ merchant.authority.add_user_role = "merchant.dev.yidian-inc.com/authority/author
 ;后台op接口
 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.op_commit = "merchant.dev.yidian-inc.com/auth/enterprise/op_commit"
 
 
 

mongo.ini

@@ -3,22 +3,26 @@
 
 ;商户项目配置
 ;商户项目继承common + 自己的配置，此节中配置会覆盖父级的相同配置（不区分环境）
-[merchant : common]
+[gateway : common]
 
 ;商户项目继承common + 自己的配置 + 生产环境特有有配置，此节中配置会覆盖父级的相同配置
-[prod-merchant : merchant : common]
+[prod-gateway : gateway : common]
 
 ;商户项目继承common + 自己的配置 + 测试环境特有有配置，此节中配置会覆盖父级的相同配置
-[perf-merchant : prod-merchant : merchant : common]
-[test-merchant : prod-merchant : merchant : common]
-merchant.host="rs_bp_test_01.int.yidian-inc.com:27018,rs_bp_test_02.int.yidian-inc.com:27018,rs_bp_test_03.int.yidian-inc.com:27018"
-merchant.uriOptions.username='rs_bp_test_rw'
-merchant.uriOptions.password='uE5bLz9#GSHXzhuaAeTDqll65mM@XC'
-merchant.uriOptions.replicaSet='rs_bp_test'
-merchant.uriOptions.readPreference='secondaryPreferred'
-merchant.uriOptions.connectTimeoutMS=500
-merchant.uriOptions.socketTimeoutMS=6000
-merchant.uriOptions.w=1
-merchant.uriOptions.wTimeoutMS=3000
-merchant.driverOptions.typeMap.root='array'
-merchant.driverOptions.typeMap.document='array'
+[perf-gateway : prod-gateway : gateway : common]
+
+
+[test-gateway : prod-gateway : gateway : common]
+gateway.host="rs_bp_test_01.int.yidian-inc.com:27018,rs_bp_test_02.int.yidian-inc.com:27018,rs_bp_test_03.int.yidian-inc.com:27018"
+gateway.uriOptions.username='rs_bp_test_rw'
+gateway.uriOptions.password='uE5bLz9#GSHXzhuaAeTDqll65mM@XC'
+gateway.uriOptions.replicaSet='rs_bp_test'
+gateway.uriOptions.readPreference='secondaryPreferred'
+gateway.uriOptions.connectTimeoutMS=500
+gateway.uriOptions.socketTimeoutMS=6000
+gateway.uriOptions.w=1
+gateway.uriOptions.wTimeoutMS=3000
+gateway.driverOptions.typeMap.root='array'
+gateway.driverOptions.typeMap.document='array'
+
+[dev-gateway : test-gateway : prod-gateway : gateway : common]
\ No newline at end of file

mysql.ini

@@ -32,6 +32,27 @@ 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'
 
+; 测试环境
+[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'
 
 
 [goods : common]

redis.ini

+[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]