diff --git a/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java b/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java index d3a3eb4..c5eeb51 100644 --- a/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java +++ b/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java @@ -20,7 +20,7 @@ public class OpenApiConfiguration { return new OpenAPI() .info(new Info().title("DiyFile") .description("一款好看的在线文件列表程序") - .version("v0.8.2") + .version("v0.8.3") .license(new License().name("MIT license").url("https://github.com/besscroft/diyfile/blob/main/LICENSE"))) .externalDocs(new ExternalDocumentation() .description("DiyFile 文档") diff --git a/diyfile-system/pom.xml b/diyfile-system/pom.xml index 5472843..7211113 100644 --- a/diyfile-system/pom.xml +++ b/diyfile-system/pom.xml @@ -71,6 +71,10 @@ org.flywaydb flyway-core + + org.flywaydb + flyway-mysql + software.amazon.awssdk diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/config/FlywayConfigure.java b/diyfile-system/src/main/java/com/besscroft/diyfile/config/FlywayConfigure.java index 133231c..aede4fb 100644 --- a/diyfile-system/src/main/java/com/besscroft/diyfile/config/FlywayConfigure.java +++ b/diyfile-system/src/main/java/com/besscroft/diyfile/config/FlywayConfigure.java @@ -11,6 +11,7 @@ import org.flywaydb.core.api.FlywayException; import org.flywaydb.core.internal.database.DatabaseType; import org.flywaydb.core.internal.exception.FlywaySqlException; import org.flywaydb.core.internal.plugin.PluginRegister; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; @@ -37,6 +38,9 @@ public class FlywayConfigure { private static final List SORTED_DATABASE_TYPES = new PluginRegister().getPlugins(DatabaseType.class).stream().sorted().collect(Collectors.toList()); private final ApplicationContext applicationContext; + @Value("${spring.flyway.enabled}") + private Boolean enabled; + @PostConstruct public void flywayMigrate() { String datasourceDriveClassName = applicationContext.getEnvironment().getProperty("spring.datasource.driver-class-name"); @@ -54,6 +58,10 @@ public class FlywayConfigure { log.info("sqlite 数据库文件已存在,路径:{}", folderPath); } } + if (!enabled) { + log.info("flyway 已关闭,跳过初始化..."); + return; + } try { String databaseProductName = dataSource.getConnection().getMetaData().getDatabaseProductName(); String dbType = databaseProductName.toLowerCase(Locale.ROOT); diff --git a/pom.xml b/pom.xml index 1b04faf..fb44cbf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.1.4 @@ -17,19 +17,19 @@ pom - 0.8.2 + 0.8.3 17 17 ${java.version} ${java.version} UTF-8 UTF-8 - 3.1.3 + 3.1.4 1.5.5.Final 0.2.0 3.5.3.2 2.2.0 - 1.34.0 + 1.36.0 5.8.20 1.4.7 6.4.4 @@ -73,6 +73,10 @@ spring-boot-configuration-processor true + + org.springframework.boot + spring-boot-starter-validation + org.springframework.boot spring-boot-starter-test