Commit 95ed690a32dacacc430bf80089705eb7320d8e2b
Merge remote-tracking branch 'origin/pudong_jdk8' into pudong_jdk8
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/resources/application-dev.properties
| @@ -20,9 +20,9 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver | @@ -20,9 +20,9 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver | ||
| 20 | spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false | 20 | spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false |
| 21 | spring.datasource.username= root | 21 | spring.datasource.username= root |
| 22 | spring.datasource.password= root | 22 | spring.datasource.password= root |
| 23 | -#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false | 23 | +#spring.datasource.url= jdbc:mysql://192.168.168.241/control?useUnicode=true&characterEncoding=utf-8&useSSL=false |
| 24 | #spring.datasource.username= root | 24 | #spring.datasource.username= root |
| 25 | -#spring.datasource.password= root | 25 | +#spring.datasource.password= root2jsp |
| 26 | spring.datasource.type= com.zaxxer.hikari.HikariDataSource | 26 | spring.datasource.type= com.zaxxer.hikari.HikariDataSource |
| 27 | 27 | ||
| 28 | #DATASOURCE SETTING | 28 | #DATASOURCE SETTING |