From 8972a45fcccc52cc47ef739b74fa16c7e7bc052b Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 16 Mar 2026 09:29:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor(database):=20=E7=A7=BB=E9=99=A4Flyway?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=81=E7=A7=BB=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 从application.yml中移除flyway相关配置项
- 从application-dev.yml中移除flyway相关配置项
- 从application-prod.yml中移除flyway相关配置项
- 将EmsEnergyConsumptionController中的StringUtils替换为Spring工具类
- 删除FlywayConfig配置类及其命令行启动器实现
- 从klp-common模块的pom.xml中移除flyway依赖
- 从根pom.xml中移除flyway核心依赖
---
.../src/main/resources/application-dev.yml | 4 --
.../src/main/resources/application-prod.yml | 4 --
klp-admin/src/main/resources/application.yml | 5 --
klp-common/pom.xml | 10 ---
.../com/klp/common/config/FlywayConfig.java | 68 -------------------
.../EmsEnergyConsumptionController.java | 2 +-
pom.xml | 6 --
7 files changed, 1 insertion(+), 98 deletions(-)
delete mode 100644 klp-common/src/main/java/com/klp/common/config/FlywayConfig.java
diff --git a/klp-admin/src/main/resources/application-dev.yml b/klp-admin/src/main/resources/application-dev.yml
index d063ec83..d79bb29f 100644
--- a/klp-admin/src/main/resources/application-dev.yml
+++ b/klp-admin/src/main/resources/application-dev.yml
@@ -130,10 +130,6 @@ spring:
# 多久检查一次连接的活性
keepaliveTime: 30000
- flyway:
- baseline-on-migrate: true # 第一次运行时建立记录，不执行历史脚本
- clean-disabled: true # 禁止清空库
-
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring:
redis:
diff --git a/klp-admin/src/main/resources/application-prod.yml b/klp-admin/src/main/resources/application-prod.yml
index eb4177b7..c3ae8558 100644
--- a/klp-admin/src/main/resources/application-prod.yml
+++ b/klp-admin/src/main/resources/application-prod.yml
@@ -124,10 +124,6 @@ spring:
# 多久检查一次连接的活性
keepaliveTime: 30000
- flyway:
- baseline-on-migrate: true # 第一次运行时建立记录，不执行历史脚本
- clean-disabled: true # 禁止清空库
-
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring:
redis:
diff --git a/klp-admin/src/main/resources/application.yml b/klp-admin/src/main/resources/application.yml
index fafb9741..5121d0e8 100644
--- a/klp-admin/src/main/resources/application.yml
+++ b/klp-admin/src/main/resources/application.yml
@@ -101,11 +101,6 @@ spring:
deserialization:
# 允许对象忽略json中不存在的属性
fail_on_unknown_properties: false
- # 实时更新数据库结构
- flyway:
- enabled: true
- locations: classpath:db/migration
- table: flyway_schema_history
# Sa-Token配置
sa-token:
diff --git a/klp-common/pom.xml b/klp-common/pom.xml
index 1a02b0a9..e7405476 100644
--- a/klp-common/pom.xml
+++ b/klp-common/pom.xml
@@ -170,16 +170,6 @@
ip2region
-
-
- org.flywaydb
- flyway-core
-
-
-
- org.flywaydb
- flyway-mysql
-
com.baomidou
diff --git a/klp-common/src/main/java/com/klp/common/config/FlywayConfig.java b/klp-common/src/main/java/com/klp/common/config/FlywayConfig.java
deleted file mode 100644
index 210ccfb0..00000000
--- a/klp-common/src/main/java/com/klp/common/config/FlywayConfig.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.klp.common.config;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-
-import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
-import org.flywaydb.core.Flyway;
-import org.flywaydb.core.api.output.MigrateResult;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class FlywayConfig {
-
- @Value("${spring.profiles.active}")
- private String activeProfile;
-
- @Value("${spring.flyway.baseline-on-migrate}")
- private boolean baselineOnMigrate;
-
- @Value("${spring.flyway.locations}")
- private String locations;
-
- @Value("${spring.flyway.table}")
- private String table;
-
- @Resource
- private DataSource dataSource;
-
- @Bean
- public Flyway flyway() {
- DataSource masterDataSource = ((DynamicRoutingDataSource) dataSource).getDataSource("master");
- System.out.println("masterDataSource class: " + masterDataSource.getClass().getName());
-
-// // 如果想显式拿底层 HikariDataSource
-// if (masterDataSource instanceof ItemDataSource) {
-// masterDataSource = ((ItemDataSource) masterDataSource).getRealDataSource();
-// }
-
- System.out.println("masterDataSource class: " + masterDataSource.getClass().getName());
- return Flyway.configure()
- .dataSource(masterDataSource) // 注意这里是真实主库 DataSource
- .baselineOnMigrate(baselineOnMigrate)
- .locations(locations)
- .table(table)
- .load();
- }
-
- @Bean
- public CommandLineRunner flywayRunner(Flyway flyway) {
- return args -> {
- System.out.println("========== 当前环境: " + activeProfile + " ==========");
- System.out.println("========== 开始执行 Flyway 数据库迁移 ==========");
-
- MigrateResult result = flyway.migrate();
- System.out.println("迁移成功版本数: " + result.migrationsExecuted);
-
- result.migrations.forEach(m -> {
- System.out.println("执行版本: " + m.version + "，描述: " + m.description);
- });
-
- System.out.println("========== Flyway 数据库迁移完成 ==========");
- };
- }
-}
-
diff --git a/klp-ems/src/main/java/com/klp/ems/controller/EmsEnergyConsumptionController.java b/klp-ems/src/main/java/com/klp/ems/controller/EmsEnergyConsumptionController.java
index 03246d6d..e0f27c45 100644
--- a/klp-ems/src/main/java/com/klp/ems/controller/EmsEnergyConsumptionController.java
+++ b/klp-ems/src/main/java/com/klp/ems/controller/EmsEnergyConsumptionController.java
@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
-import org.flywaydb.core.internal.util.StringUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
diff --git a/pom.xml b/pom.xml
index 60c8454d..0e193bf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -363,12 +363,6 @@
${klp-flowable-plus.version}
-
-
- org.flywaydb
- flyway-core
- 8.5.13
-
com.klp
klp-ems