diff --git a/springboot-database/src/main/java/com/tiesheng/database/service/DbMigrationInitializer.java b/springboot-database/src/main/java/com/tiesheng/database/service/DbMigrationInitializer.java index fa2a93b..74483d8 100644 --- a/springboot-database/src/main/java/com/tiesheng/database/service/DbMigrationInitializer.java +++ b/springboot-database/src/main/java/com/tiesheng/database/service/DbMigrationInitializer.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.db.Db; import cn.hutool.db.Entity; +import cn.hutool.log.LogFactory; import com.tiesheng.database.config.DbMigrationConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.servlet.ServletContextInitializer; @@ -22,6 +23,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.concurrent.atomic.AtomicReference; import java.util.zip.Checksum; /** @@ -92,6 +94,8 @@ public class DbMigrationInitializer implements ServletContextInitializer { if (entity == null) { return; } + AtomicReference success= new AtomicReference<>(0); + AtomicReference fail= new AtomicReference<>(0); db.tx((VoidFunc1) parameter -> { List split = StrUtil.split(readUtf8, ";"); for (String sql : split) { @@ -104,11 +108,13 @@ public class DbMigrationInitializer implements ServletContextInitializer { } try { parameter.execute(sql); + success.getAndSet(success.get() + 1); } catch (Exception ignore) { + fail.getAndSet(fail.get() + 1); } } }); - + LogFactory.get().info("执行sql文件{},成功数:{},失败数:{}。",filename,success.get(),fail.get()); entity.set("checksum", checksum.getValue()); entity.set("update_time", DateUtil.date()); db.update(entity, Entity.create(dbMigrationConfig.getTable()).set("id", entity.get("id"))); diff --git a/springboot-web/src/main/resources/db/migration/core_log_process.sql b/springboot-web/src/main/resources/db/migration/core_log_process.sql index 945bf23..ab0af9c 100644 --- a/springboot-web/src/main/resources/db/migration/core_log_process.sql +++ b/springboot-web/src/main/resources/db/migration/core_log_process.sql @@ -33,10 +33,12 @@ CREATE TABLE `core_log_process` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '日志-过程' ROW_FORMAT = Dynamic; -alter table core_log_process add 'status' int(6) not null default 0 comment '状态(0-未完成,1-完成)'; -- ---------------------------- -- Records of core_log_process -- ---------------------------- SET FOREIGN_KEY_CHECKS = 1; + +ALTER TABLE core_log_process ADD status int(6) default 0 COMMENT '状态(0-未完成,1-已完成)'; +commit;