diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoDataSourceConfig.java b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoDataSourceConfig.java index 338432b8..4e6bd717 100644 --- a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoDataSourceConfig.java +++ b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoDataSourceConfig.java @@ -44,6 +44,8 @@ public HikariDataSource hikaricpDataSource() { * https://github.com/alibaba/druid/blob/master/src/test/java/com/alibaba/druid/DbTestCase.java * @author Lemon */ + // Need to be specify to explicit one when using multiple datasource. Use this or config in application.yml + // @FlywayDataSource @Bean @ConfigurationProperties(prefix = "spring.datasource.druid") public DruidDataSource druidDataSource() { diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/application.yml b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/application.yml index 86bf71b3..bb4ece1c 100644 --- a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/application.yml +++ b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/application.yml @@ -1,4 +1,9 @@ spring: +# If using flyway-core dependency, either comment this out or use @FlywayDatasource in DemoDataSourceConfig +# flyway: +# url: ${spring.datasource.hikari.jdbc-url} +# user: ${spring.datasource.hikari.username} +# password: ${spring.datasource.hikari.password} datasource: # type: com.zaxxer.hikari.HikariDataSource # driver-class-name: com.mysql.cj.jdbc.Driver