From 4bcf784a6d550c14e18c5c7b1bb8d577ba6e3ea8 Mon Sep 17 00:00:00 2001 From: heavyrain2012 Date: Wed, 29 Sep 2021 19:50:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E5=8D=87=E7=BA=A7=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broker/src/main/java/win/liyufan/im/DBUtil.java | 8 ++++++-- 1 file changed, 6 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 8d6a92aab..488943dfc 100755 --- a/broker/src/main/java/win/liyufan/im/DBUtil.java +++ b/broker/src/main/java/win/liyufan/im/DBUtil.java @@ -107,8 +107,12 @@ public static void init(IConfig config) { } Flyway flyway = Flyway.configure().dataSource(comboPooledDataSource).locations(migrateLocation).baselineOnMigrate(true).load(); - if(!IsEmbedDB && (flyway.info().current() == null || flyway.info().current().getVersion().getMajor().intValue() < 43)) { - System.out.println("数据库执行初始化或升级需要较长时间，可能长达数分钟或更长，请耐心等待，不要中断。。。"); + if(!IsEmbedDB) { + if(flyway.info().current() == null) { + System.out.println("数据库执行初始化需要较长时间，可能长达数分钟或更长，请耐心等待，不要中断。。。"); + } else if(flyway.info().current().getVersion().getMajor().intValue() < 43) { + System.out.println("数据库执行升级需要较长时间，可能长达数分钟或更长，请耐心等待，不要中断。。。"); + } } flyway.migrate();