Commit 8b18498

authored

Merge pull request APIJSON#16 from myme5261314/master

Add comment to help the developers facing issue when using flyway-core in APIJSON-MultiDataSource project

2 parents 9e3865d + 4a9289c commit 8b18498Copy full SHA for 8b18498

File tree

-0

lines changed

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main
- java/apijson/boot
  - DemoDataSourceConfig.java
- resources
  - application.yml

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ public HikariDataSource hikaricpDataSource() {`
`44`	`44`	`* https://github.com/alibaba/druid/blob/master/src/test/java/com/alibaba/druid/DbTestCase.java`
`45`	`45`	`* @author Lemon`
`46`	`46`	`*/`
	`47`	`+ // Need to be specify to explicit one when using multiple datasource. Use this or config in application.yml`
	`48`	`+ // @FlywayDataSource`
`47`	`49`	`@Bean`
`48`	`50`	`@ConfigurationProperties(prefix = "spring.datasource.druid")`
`49`	`51`	`public DruidDataSource druidDataSource() {`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,9 @@`
`1`	`1`	`spring:`
	`2`	`+# If using flyway-core dependency, either comment this out or use @FlywayDatasource in DemoDataSourceConfig`
	`3`	`+# flyway:`
	`4`	`+# url: ${spring.datasource.hikari.jdbc-url}`
	`5`	`+# user: ${spring.datasource.hikari.username}`
	`6`	`+# password: ${spring.datasource.hikari.password}`
`2`	`7`	`datasource:`
`3`	`8`	`# type: com.zaxxer.hikari.HikariDataSource`
`4`	`9`	`# driver-class-name: com.mysql.cj.jdbc.Driver`

Comments

(0)