From cf3cc08cd897f0ad4b2d6370835908f6fe0e6073 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 22 Jan 2024 17:55:25 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=96=B0=E5=A2=9E=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=9A=84=E6=89=A7=E8=A1=8C=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?,=20=E7=A1=AE=E4=BF=9D=E4=BB=A5=E5=90=8E=E7=9A=84=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E8=BF=AD=E4=BB=A3=E5=8F=AA=E9=9C=80=E8=A6=81=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E8=84=9A=E6=9C=AC=E6=89=A7=E8=A1=8C=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=AF.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql | 2 +-
 .../workflow/server/initializer/VersionUpgradeInitializer.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql b/workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql
index f7f9c8d85..d00b104a9 100644
--- a/workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql
+++ b/workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql
@@ -6,7 +6,7 @@ insert into ext_ax_hi_taskinst (proc_inst_id, task_id, task_definition_key, stat
 select PROC_INST_ID_, ID_, TASK_DEF_KEY_, 'PROCESSING', ifnull(ASSIGNEE_, '') as ASSIGNEE_
 from act_hi_taskinst
 where END_TIME_ is null
-  and ID_ not in (select distinct task_id from ext_ax_hi_taskinst)
+  and ID_ not in (select distinct task_id from ext_ax_hi_taskinst);
 
 
 
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java
index 4d3a5b3dd..eb2ec979d 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java
@@ -58,9 +58,9 @@ public class VersionUpgradeInitializer implements ApplicationRunner {
             int current = Integer.parseInt(currentVersion.replace(".", ""));
             if (upgradeVersion > current) {
                 newVersions.add(upgradeVersion);
-                log.debug("execute sql script: {}", i);
                 try {
                     executeSqlScript(i);
+                    log.debug("execute sql script: {}", i);
                 } catch (Exception e) {
                     LogUtil.error(LogUtil.ErrorType.ERROR_SQL, "升级服务数据库版本发生异常,文件: {}, 异常信息: {}", i, e.getMessage());
                     result.compareAndSet(true, false);
@@ -113,6 +113,7 @@ public class VersionUpgradeInitializer implements ApplicationRunner {
             // Split SQL statements and execute each one
             String[] sqlStatements = scriptBuilder.toString().split(";");
             for (String sql : sqlStatements) {
+                log.info("sql: {}", sql);
                 jdbcTemplate.execute(sql);
             }
         } catch (IOException e) {