From a819a8df592422012b5c29b8b411ba7056094986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?= <806783409@qq.com> Date: Thu, 2 Mar 2023 23:20:18 +0800 Subject: [PATCH] =?UTF-8?q?#I6IWI9=20=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=84=9A=E6=9C=AC=E6=97=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=89=BE=E5=88=B0=E6=96=87=E4=BB=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++++++ zyplayer-doc-api/pom.xml | 2 -- zyplayer-doc-core/pom.xml | 4 ++++ .../com/zyplayer/doc/core/util/UpgradeInfo.java | 17 +++++++++++++++++ .../doc/core/util/ZyplayerDocVersion.java | 6 +++--- zyplayer-doc-data/pom.xml | 2 -- zyplayer-doc-db/pom.xml | 2 -- .../doc/manage/task/UpgradeSystemDdlTask.java | 17 ++++++++++++----- 8 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/UpgradeInfo.java diff --git a/pom.xml b/pom.xml index 18bf531a..bcb2bb51 100644 --- a/pom.xml +++ b/pom.xml @@ -145,6 +145,12 @@ freemarker 2.3.28 + + org.projectlombok + lombok + 1.18.24 + compile + javax.servlet servlet-api diff --git a/zyplayer-doc-api/pom.xml b/zyplayer-doc-api/pom.xml index f61bd3fd..9d743a4a 100644 --- a/zyplayer-doc-api/pom.xml +++ b/zyplayer-doc-api/pom.xml @@ -59,8 +59,6 @@ org.projectlombok lombok - RELEASE - compile diff --git a/zyplayer-doc-core/pom.xml b/zyplayer-doc-core/pom.xml index a6757cd5..127be595 100644 --- a/zyplayer-doc-core/pom.xml +++ b/zyplayer-doc-core/pom.xml @@ -37,5 +37,9 @@ com.baomidou mybatis-plus-core + + org.projectlombok + lombok + diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/UpgradeInfo.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/UpgradeInfo.java new file mode 100644 index 00000000..9c0d795f --- /dev/null +++ b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/UpgradeInfo.java @@ -0,0 +1,17 @@ +package com.zyplayer.doc.core.util; + +import lombok.Data; + +@Data +public class UpgradeInfo { + private String version; + private boolean haveUpgradeSql; + + public UpgradeInfo() { + } + + public UpgradeInfo(String version, boolean haveUpgradeSql) { + this.version = version; + this.haveUpgradeSql = haveUpgradeSql; + } +} diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java index 6bbe09d4..51259e98 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java +++ b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java @@ -15,8 +15,8 @@ public class ZyplayerDocVersion { /** * 每次升级必须添加一条记录，用于执行它的升级SQL */ - public static final List versionUpgrade = new LinkedList() {{ - add("1.1.3"); - add("1.1.2"); + public static final List versionUpgrade = new LinkedList() {{ + add(new UpgradeInfo("1.1.3", false)); + add(new UpgradeInfo("1.1.2", true)); }}; } diff --git a/zyplayer-doc-data/pom.xml b/zyplayer-doc-data/pom.xml index 03220041..890c8566 100644 --- a/zyplayer-doc-data/pom.xml +++ b/zyplayer-doc-data/pom.xml @@ -111,8 +111,6 @@ org.projectlombok lombok - RELEASE - compile diff --git a/zyplayer-doc-db/pom.xml b/zyplayer-doc-db/pom.xml index 01df4c4c..cadd2d65 100644 --- a/zyplayer-doc-db/pom.xml +++ b/zyplayer-doc-db/pom.xml @@ -54,8 +54,6 @@ org.projectlombok lombok - RELEASE - compile diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeSystemDdlTask.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeSystemDdlTask.java index 5f3bb705..c17b4afd 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeSystemDdlTask.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeSystemDdlTask.java @@ -4,6 +4,7 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.zyplayer.doc.core.enums.SystemConfigEnum; +import com.zyplayer.doc.core.util.UpgradeInfo; import com.zyplayer.doc.core.util.ZyplayerDocVersion; import com.zyplayer.doc.data.repository.manage.mapper.UserInfoMapper; import com.zyplayer.doc.data.service.manage.SystemConfigService; @@ -107,13 +108,15 @@ public class UpgradeSystemDdlTask { logger.info("升级数据库DDL脚本：{} --> {}", nowVersion, ZyplayerDocVersion.version); boolean isStart = false; for (int i = ZyplayerDocVersion.versionUpgrade.size() - 1; i >= 0; i--) { - String version = ZyplayerDocVersion.versionUpgrade.get(i); + UpgradeInfo upgradeInfo = ZyplayerDocVersion.versionUpgrade.get(i); if (!isStart) { - if (Objects.equals(version, nowVersion)) { + if (Objects.equals(upgradeInfo.getVersion(), nowVersion)) { isStart = true; } + } else if (!upgradeInfo.isHaveUpgradeSql()) { + logger.info("该版本无DDL脚本，跳过此版本：" + upgradeInfo.getVersion()); } else { - upgradeByVersion(version, tableList); + upgradeByVersion(upgradeInfo.getVersion(), tableList); } } } @@ -156,8 +159,12 @@ public class UpgradeSystemDdlTask { public void upgradeByStart() { logger.info("初始升级数据库DDL脚本：{} --> {}", "1.1.1", ZyplayerDocVersion.version); for (int i = ZyplayerDocVersion.versionUpgrade.size() - 1; i >= 0; i--) { - String version = ZyplayerDocVersion.versionUpgrade.get(i); - String sql = loadDDLFile("sql/upgrade/" + version + ".sql"); + UpgradeInfo upgradeInfo = ZyplayerDocVersion.versionUpgrade.get(i); + if (!upgradeInfo.isHaveUpgradeSql()) { + logger.info("该版本无DDL脚本，跳过此版本：" + upgradeInfo.getVersion()); + continue; + } + String sql = loadDDLFile("sql/upgrade/" + upgradeInfo.getVersion() + ".sql"); if (StringUtils.isBlank(sql)) { return; }