diff --git a/buildpackage/src/main/resources/application-llg.yml b/buildpackage/src/main/resources/application-llg.yml index e8cf3635..7f1bffb6 100644 --- a/buildpackage/src/main/resources/application-llg.yml +++ b/buildpackage/src/main/resources/application-llg.yml @@ -18,7 +18,7 @@ spring: # username: hzya flyway: # 启动flyway migration, 默认为true - enabled: false + enabled: true datasource: dynamic: druid: diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml index 19b59c47..3bbd6295 100644 --- a/buildpackage/src/main/resources/application.yml +++ b/buildpackage/src/main/resources/application.yml @@ -6,6 +6,8 @@ server: tomcat: uri-encoding: utf-8 spring: + autoconfigure: + exclude: org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration flyway: # 启动flyway migration, 默认为true enabled: true diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java b/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java index 598e4032..8630f562 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/web/init/FlywayConfig.java @@ -48,29 +48,31 @@ public class FlywayConfig { @PostConstruct public void migrateOrder() { - String pwd = AESUtil.decrypt(password); - DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource; - DataSource dsDatasource = null; + if("false".equals(enabled)){ + String pwd = AESUtil.decrypt(password); + DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource; + DataSource dsDatasource = null; dsDatasource = ds.getDataSource("master"); - // 将路径转换 - Flyway flyway = Flyway.configure() - //.dataSource(url,username,pwd) - .dataSource(dsDatasource) - .cleanDisabled(cleanDisabled) - .locations(locations) - .table(table) - .encoding("utf-8") - .outOfOrder(true) - .baselineOnMigrate(true) - .validateOnMigrate(baselineOnMigrate) - .validateOnMigrate(validateOnMigrat) - .sqlMigrationPrefix(sqlMigrationPrefix) - .sqlMigrationSeparator(sqlMigrationSeparator) - .sqlMigrationSuffixes(sqlMigrationSuffixes) - .placeholderReplacement(placeholderReplacement) - .load(); - flyway.migrate(); + // 将路径转换 + Flyway flyway = Flyway.configure() + //.dataSource(url,username,pwd) + .dataSource(dsDatasource) + .cleanDisabled(cleanDisabled) + .locations(locations) + .table(table) + .encoding("utf-8") + .outOfOrder(true) + .baselineOnMigrate(true) + .validateOnMigrate(baselineOnMigrate) + .validateOnMigrate(validateOnMigrat) + .sqlMigrationPrefix(sqlMigrationPrefix) + .sqlMigrationSeparator(sqlMigrationSeparator) + .sqlMigrationSuffixes(sqlMigrationSuffixes) + .placeholderReplacement(placeholderReplacement) + .load(); + flyway.migrate(); + } } }