Authored by ping

Merge branch 'test'

@@ -15,7 +15,7 @@ datasources: @@ -15,7 +15,7 @@ datasources:
15 daos: 15 daos:
16 - com.yoho.unions.dal.IUnionLogsDAO 16 - com.yoho.unions.dal.IUnionLogsDAO
17 17
18 - yoho_union: 18 + app:
19 servers: 19 servers:
20 - 192.168.102.219:3306 20 - 192.168.102.219:3306
21 - 192.168.102.219:3306 21 - 192.168.102.219:3306
@@ -15,7 +15,7 @@ datasources: @@ -15,7 +15,7 @@ datasources:
15 - com.yoho.unions.dal.IUnionLogsDAO 15 - com.yoho.unions.dal.IUnionLogsDAO
16 16
17 17
18 - yoho_union: 18 + app:
19 servers: 19 servers:
20 - ${bigdate.db.url} 20 - ${bigdate.db.url}
21 username: ${bigdate.db.username} 21 username: ${bigdate.db.username}