Commit 094f71f4919cf114f51f1236df03d5d51b7392dc
Merge branch 'Neuter' of http://120.78.57.84/Elvis/SunvoteEducation into Neuter
Showing
1 changed file
with
4 additions
and
4 deletions
resources/dbconfig.properties
| 1 | -#数据源 1 | ||
| 2 | -#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | ||
| 3 | -url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | 1 | +#æ°æ®æº 1 |
| 2 | +url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | ||
| 3 | +#url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | ||
| 4 | #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | 4 | #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
| 5 | #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | 5 | #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
| 6 | #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | 6 | #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
| @@ -26,7 +26,7 @@ removeAbandoned:true | @@ -26,7 +26,7 @@ removeAbandoned:true | ||
| 26 | removeAbandonedTimeout:1800 | 26 | removeAbandonedTimeout:1800 |
| 27 | logAbandoned:true | 27 | logAbandoned:true |
| 28 | 28 | ||
| 29 | -#数据源 2（没启用，不用管,文档大全里面有配置文档） | 29 | +#æ°æ®æº 2ï¼æ²¡å¯ç¨ï¼ä¸ç¨ç®¡,ææ¡£å¤§å ¨éé¢æé ç½®ææ¡£ï¼ |
| 30 | url2:jdbc:mysql://localhost:3306/sunvote2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 | 30 | url2:jdbc:mysql://localhost:3306/sunvote2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 |
| 31 | driverClassName2:com.mysql.jdbc.Driver | 31 | driverClassName2:com.mysql.jdbc.Driver |
| 32 | username2:root | 32 | username2:root |