From aa36a5c690af04393fe56db49481af9cd91852e5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 25 Jan 2023 10:51:14 +0800 Subject: [PATCH] =?UTF-8?q?!378=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD=E9=80=9F?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/infra/service/codegen/CodegenServiceImpl.java | 4 ---- .../module/infra/service/db/DatabaseTableServiceImpl.java | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java index 8cab42784..b5103bc04 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java @@ -221,10 +221,6 @@ public class CodegenServiceImpl implements CodegenService { @Override public List getDatabaseTableList(Long dataSourceConfigId, String name, String comment) { List tables = databaseTableService.getTableList(dataSourceConfigId, name, comment); - // 移除置顶前缀的表名 // TODO 未来做成可配置 - tables.removeIf(table -> table.getName().toUpperCase().startsWith("QRTZ_")); - tables.removeIf(table -> table.getName().toUpperCase().startsWith("ACT_")); - tables.removeIf(table -> table.getName().toUpperCase().startsWith("FLW_")); // 移除已经生成的表 // 移除在 Codegen 中，已经存在的 Set existsTables = CollectionUtils.convertSet( diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java index 52014d514..cd3ddaba7 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java @@ -52,6 +52,9 @@ public class DatabaseTableServiceImpl implements DatabaseTableService { StrategyConfig.Builder strategyConfig = new StrategyConfig.Builder(); if (StrUtil.isNotEmpty(name)) { strategyConfig.addInclude(name); + } else { + // 移除工作流和定时任务前缀的表名 // TODO 未来做成可配置 + strategyConfig.addExclude("ACT_[\\S\\s]+|QRTZ_[\\S\\s]+|FLW_[\\S\\s]+"); } GlobalConfig globalConfig = new GlobalConfig.Builder().dateType(DateType.ONLY_DATE).build(); // 只使用 LocalDateTime 类型，不使用 LocalDate ConfigBuilder builder = new ConfigBuilder(null, dataSourceConfig, strategyConfig.build(),