Commit 700398ba1359e75c766e5116b4b1d0f962b5fdf9
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
Showing
2 changed files
with
7 additions
and
7 deletions
src/main/resources/application-dev.yml
| @@ -13,12 +13,12 @@ spring: | @@ -13,12 +13,12 @@ spring: | ||
| 13 | timeout: 10000 | 13 | timeout: 10000 |
| 14 | # [不可用] jdbc数据库配置, 暂不支持 | 14 | # [不可用] jdbc数据库配置, 暂不支持 |
| 15 | datasource: | 15 | datasource: |
| 16 | - # name: eiot | ||
| 17 | - # url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true | ||
| 18 | - # username: | ||
| 19 | - # password: | ||
| 20 | - # type: com.alibaba.druid.pool.DruidDataSource | ||
| 21 | - # driver-class-name: com.mysql.jdbc.Driver | 16 | + #name: eiot |
| 17 | + #url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true | ||
| 18 | + #username: | ||
| 19 | + #password: | ||
| 20 | + #type: com.alibaba.druid.pool.DruidDataSource | ||
| 21 | + #driver-class-name: com.mysql.jdbc.Driver | ||
| 22 | name: eiot | 22 | name: eiot |
| 23 | url: jdbc:sqlite::resource:wvp.sqlite | 23 | url: jdbc:sqlite::resource:wvp.sqlite |
| 24 | username: | 24 | username: |