update : dev

interface.ini

@@ -31,6 +31,15 @@ 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"
 
+[dev-gateway : test-gateway : gateway : common]
+;用户审核相关接口
+merchant.personal.check = "merchant.dev.yidian-inc.com/auth/personal/check"
+merchant.personal.live_identity = "merchant.dev.yidian-inc.com/auth/personal/live_identity"
+merchant.personal.complete = "merchant.dev.yidian-inc.com/auth/personal/complete"
+merchant.personal.authentication = "merchant.dev.yidian-inc.com/auth/personal/authentication"
+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 : common]
 [test-merchant : merchant : common]
@@ -39,4 +48,6 @@ service.jw_user.get_user_info       = "http://10.9.146.155:8100/ydInner/getUserI
 service.jw_user.get_all_city_tree   = "http://10.9.146.155:8100/ydInner/getAllCityTree"
 
 ;idgen发号器
-service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
+service.idgen = "idgen-test.ini.yidian-inc.com/id/get"
\ No newline at end of file
+
+[dev-gateway : test-merchant : merchant : common]
\ No newline at end of file

mysql.ini

@@ -18,5 +18,16 @@ 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:3308'
+merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3308,r.bp_test_mysql1_2.int.yidian-inc.com:3308'
+
+; 联调环境
+[dev-merchant : prod-merchant : merchant : common]
+merchant.database_type='mysql'
+merchant.database_name='merchant'
+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'