YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by wangshusheng
Commit f0f6b121a2e87b3a7b72a25920da1e245e5c812f 2 parents 3452a78d c2b7bc22

Merge branch 'test6.5.3'

Inline Side-by-side
Showing 1 changed file with 17 additions and 15 deletions
1 datasources: 1 datasources:
2 yoho_passport: 2 yoho_passport:
3 - servers:  
4 - - ${jdbc.mysql.yohopassport.master}  
5 - - ${jdbc.mysql.yohopassport.slave}  
6 - username: ${jdbc.mysql.yohopassport.username}  
7 - password: ${jdbc.mysql.yohopassport.password} 3 + username: ${jdbc.mysql.cobar.username}
  4 + password: ${jdbc.mysql.cobar.password}
  5 + cobar: true
  6 + maxConnections: 80
  7 + minIdle: 20
  8 + maxIdle: 40
8 9
9 yohobuy_logs: 10 yohobuy_logs:
10 servers: 11 servers:
@@ -32,11 +33,12 @@ datasources: @@ -32,11 +33,12 @@ datasources:
32 - com.yoho.unions.dal.BaseUserActiveDayMapper 33 - com.yoho.unions.dal.BaseUserActiveDayMapper
33 34
34 yh_unions: 35 yh_unions:
35 - servers:  
36 - - ${jdbc.mysql.yh_union.master}  
37 - - ${jdbc.mysql.yh_union.slave}  
38 - username: ${jdbc.mysql.yh_union.username}  
39 - password: ${jdbc.mysql.yh_union.password} 36 + username: ${jdbc.mysql.cobar.username}
  37 + password: ${jdbc.mysql.cobar.password}
  38 + cobar: true
  39 + maxConnections: 80
  40 + minIdle: 20
  41 + maxIdle: 40
40 daos: 42 daos:
41 - com.yoho.unions.dal.IUserOrdersDAO 43 - com.yoho.unions.dal.IUserOrdersDAO
42 - com.yoho.unions.dal.IUnionTypeDAO 44 - com.yoho.unions.dal.IUnionTypeDAO
@@ -112,12 +114,12 @@ datasources: @@ -112,12 +114,12 @@ datasources:
112 - com.yoho.unions.dal.OrdersGiftCardMapper 114 - com.yoho.unions.dal.OrdersGiftCardMapper
113 115
114 yh_guang: 116 yh_guang:
115 - servers:  
116 - - ${jdbc.mysql.yhguang.master}  
117 - - ${jdbc.mysql.yhguang.slave}  
118 - username: ${jdbc.mysql.yhguang.username}  
119 - password: ${jdbc.mysql.yhguang.password} 117 + username: ${jdbc.mysql.cobar.username}
  118 + password: ${jdbc.mysql.cobar.password}
  119 + cobar: true
120 maxConnections: 80 120 maxConnections: 80
  121 + minIdle: 20
  122 + maxIdle: 40
121 daos: 123 daos:
122 - com.yoho.unions.dal.IArticleDAO 124 - com.yoho.unions.dal.IArticleDAO
123 - com.yoho.unions.dal.IArticleBlockDao 125 - com.yoho.unions.dal.IArticleBlockDao