From c1d2c7783715dc11dd2ea38eb8ff199bfcb5585d Mon Sep 17 00:00:00 2001 From: heavyrain2012 Date: Sat, 19 Jun 2021 09:15:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=B0=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/src/main/java/win/liyufan/im/DBUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/broker/src/main/java/win/liyufan/im/DBUtil.java b/broker/src/main/java/win/liyufan/im/DBUtil.java index 78bb2609..81b2618b 100755 --- a/broker/src/main/java/win/liyufan/im/DBUtil.java +++ b/broker/src/main/java/win/liyufan/im/DBUtil.java @@ -105,9 +105,9 @@ public class DBUtil { } } + Flyway flyway = Flyway.configure().dataSource(comboPooledDataSource).locations(migrateLocation).baselineOnMigrate(true).load(); - BigInteger majorVersion = flyway.info().current().getVersion().getMajor(); - if((IsEmbedDB && majorVersion.intValue() < 38) || (!IsEmbedDB && majorVersion.intValue() < 43)) { + if(!IsEmbedDB && (flyway.info().current() == null || flyway.info().current().getVersion().getMajor().intValue() < 43)) { System.out.println("数据库升级需要较长时间,可能长达数分钟或更长,请耐心等待,不要中断。。。"); } flyway.migrate();