github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7651 from testnet0/master 

修复flyway自动升级失败
pull/7981/head
JEECG 2025-03-20 10:39:08 +08:00 committed by GitHub
parent 61d2857ca7 ac30ed67bc
commit e9326cab8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/config/flyway/FlywayConfig.java
View File

@ -11,6 +11,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import javax.annotation.PostConstruct;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.util.Map; import java.util.Map;
@ -35,7 +36,7 @@ public class FlywayConfig {
*/ */
@Value("${spring.flyway.enabled:false}") @Value("${spring.flyway.enabled:false}")
private Boolean enabled; private Boolean enabled;
/** /**
* 编码格式，默认UTF-8 * 编码格式，默认UTF-8
*/ */
@ -95,13 +96,13 @@ public class FlywayConfig {
*/ */
@Value("${spring.flyway.clean-disabled:true}") @Value("${spring.flyway.clean-disabled:true}")
private Boolean cleanDisabled; private Boolean cleanDisabled;
@Bean @PostConstruct
public void migrate() { public void migrate() {
if(!enabled){ if(!enabled){
return; return;
} }
DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource; DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;
Map<String, DataSource> dataSources = ds.getDataSources(); Map<String, DataSource> dataSources = ds.getDataSources();
dataSources.forEach((k, v) -> { dataSources.forEach((k, v) -> {