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

interface.ini

@@ -141,8 +141,8 @@ 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.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.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_record_info     = "merchant.dev.yidian-inc.com/auth/enterprise/get_record_info"
+merchant.enterprise.get_log             = "merchant.dev.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"

mysql.ini

@@ -63,6 +63,17 @@ merchant.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_
 ; 预发环境
 [perf-goods : prod-goods : merchant : common]
 
+；测试环境
+[test-goods : prod-goods : merchant : common]
+goods.database_type='mysql'
+goods.database_name='goods'
+goods.connect_timeout=10
+goods.username='bp_test_rw'
+goods.password='hf#EPZn9RTppfg9cfboSHVFP38n1hZ'
+goods.charset='utf8mb4'
+goods.write.host='w.bp_test_mysql1.int.yidian-inc.com:3306'
+goods.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.int.yidian-inc.com:3306'
+
 ；开发联调测试
 [dev-goods : prod-goods : merchant : common]
 goods.database_type='mysql'