From 055814996922bf88cd58fb7aa0f0546f2864cc60 Mon Sep 17 00:00:00 2001 From: chao <3072464591@QQ.com> Date: Thu, 9 May 2024 09:29:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor()=20=E6=8B=86=E5=88=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90,=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E4=B8=89=E5=B1=82=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 2 +- .../com/etl/ETLDataSourceApplication.java | 0 .../controller/DataDictionaryController.java | 0 .../DataDictionaryTypeController.java | 0 .../mapper/DataDictionaryMapper.java | 0 .../mapper/DataDictionaryTypeMapper.java | 0 .../service/IDataDictionaryService.java | 0 .../service/IDataDictionaryTypeService.java | 0 .../impl/DataDictionaryTypeServiceImpl.java | 0 .../impl/IDataDictionaryServiceImpl.java | 0 .../controller/DataSourceController.java | 0 .../data/source/mapper/DataSourceMapper.java | 0 .../source/service/IDataSourceService.java | 0 .../service/impl/DataSourceServiceImpl.java | 0 .../controller/AssetStructureController.java | 0 .../AssetStructureTableController.java | 0 .../AssetTableDetailsController.java | 0 .../mapper/AssetStructureMapper.java | 0 .../mapper/AssetStructureTableMapper.java | 0 .../mapper/AssetTableDetailsMapper.java | 0 .../service/IAssetStructureService.java | 0 .../service/IAssetStructureTableService.java | 0 .../service/IAssetTableDetailsService.java | 0 .../impl/AssetStructureServiceImpl.java | 0 .../impl/AssetStructureTableServiceImpl.java | 0 .../impl/AssetTableDetailsServiceImpl.java | 0 .../type/controller/DataTypeController.java | 0 .../etl/data/type/mapper/DataTypeMapper.java | 0 .../data/type/service/IDataTypeService.java | 0 .../service/impl/DataTypeServiceImpl.java | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/bootstrap.yml | 0 .../src/main/resources/logback.xml | 0 .../mapper/data/DataSourceMapper.xml | 0 .../resources/mapper/data/DataTypeMapper.xml | 0 etl-modules/etl-modules-data-source/pom.xml | 2 +- .../etl-modules-rule-engine-common/pom.xml | 26 ++++++ .../etl/rule/engine}/domain/EngineRule.java | 2 +- .../engine}/domain/EngineRuleVersion.java | 2 +- .../EngineRuleAndEngineRuleVersionResp.java | 6 +- .../etl-modules-rule-engine-remote/pom.xml | 26 ++++++ .../etl-modules-rule-engine-server/pom.xml | 88 +++++++++++++++++++ .../etl/rule/ETLRuleEngineApplication.java | 24 +++++ .../classLoading/CustomClassLoader.java | 2 +- .../controller/EngineRuleController.java | 26 +++--- .../EngineRuleVersionController.java | 10 +-- .../rule/engine}/mapper/EngineRuleMapper.java | 4 +- .../mapper/EngineRuleVersionMapper.java | 4 +- .../rule/engine}/scope/DataModelContext.java | 2 +- .../rule/engine}/scope/DataSetContext.java | 2 +- .../etl/rule/engine}/scope/RecordContext.java | 2 +- .../etl/rule/engine}/scope/TaskContext.java | 2 +- .../engine}/service/IEngineRuleService.java | 7 +- .../service/IEngineRuleVersionService.java | 4 +- .../service/impl/EngineRuleServiceImpl.java | 16 ++-- .../impl/EngineRuleVersionServiceImpl.java | 9 +- .../engine}/utils/DynamicCompilation.java | 2 +- .../utils/DynamicCompilationExample.java | 2 +- .../engine}/utils/JavaSourceFromString.java | 2 +- .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 35 ++++++++ .../src/main/resources/logback.xml | 74 ++++++++++++++++ .../mapper/rule}/EngineRuleMapper.xml | 10 +-- etl-modules/etl-modules-rule-engine/pom.xml | 29 ++++++ etl-modules/pom.xml | 1 + pom.xml | 14 +++ 66 files changed, 380 insertions(+), 59 deletions(-) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/pom.xml (97%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/ETLDataSourceApplication.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/dictionary/controller/DataDictionaryController.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/dictionary/controller/DataDictionaryTypeController.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryMapper.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryTypeMapper.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/dictionary/service/IDataDictionaryService.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/dictionary/service/IDataDictionaryTypeService.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/dictionary/service/impl/DataDictionaryTypeServiceImpl.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/dictionary/service/impl/IDataDictionaryServiceImpl.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/source/controller/DataSourceController.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/source/mapper/DataSourceMapper.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/source/service/IDataSourceService.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/controller/AssetStructureController.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/controller/AssetStructureTableController.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/controller/AssetTableDetailsController.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/mapper/AssetStructureMapper.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/mapper/AssetStructureTableMapper.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/mapper/AssetTableDetailsMapper.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/service/IAssetStructureService.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/service/IAssetStructureTableService.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/service/IAssetTableDetailsService.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/service/impl/AssetStructureServiceImpl.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/type/controller/DataTypeController.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/type/mapper/DataTypeMapper.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/type/service/IDataTypeService.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/resources/banner.txt (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/resources/bootstrap.yml (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/resources/logback.xml (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/resources/mapper/data/DataSourceMapper.xml (100%) rename etl-modules/etl-modules-data-source/{etl-modules-data-source-system => etl-modules-data-source-server}/src/main/resources/mapper/data/DataTypeMapper.xml (100%) create mode 100644 etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/pom.xml rename etl-modules/{etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine}/domain/EngineRule.java (98%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine}/domain/EngineRuleVersion.java (98%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine}/domain/resp/EngineRuleAndEngineRuleVersionResp.java (93%) create mode 100644 etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-remote/pom.xml create mode 100644 etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/pom.xml create mode 100644 etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/ETLRuleEngineApplication.java rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/classLoading/CustomClassLoader.java (88%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/controller/EngineRuleController.java (85%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/controller/EngineRuleVersionController.java (83%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/mapper/EngineRuleMapper.java (93%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/mapper/EngineRuleVersionMapper.java (76%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/scope/DataModelContext.java (88%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/scope/DataSetContext.java (88%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/scope/RecordContext.java (87%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/scope/TaskContext.java (84%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/service/IEngineRuleService.java (92%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/service/IEngineRuleVersionService.java (88%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/service/impl/EngineRuleServiceImpl.java (96%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/service/impl/EngineRuleVersionServiceImpl.java (86%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/utils/DynamicCompilation.java (98%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/utils/DynamicCompilationExample.java (98%) rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine}/utils/JavaSourceFromString.java (95%) create mode 100644 etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/banner.txt create mode 100644 etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/bootstrap.yml create mode 100644 etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/logback.xml rename etl-modules/{etl-modules-data-source/etl-modules-data-source-system/src/main/resources/mapper/data => etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/mapper/rule}/EngineRuleMapper.xml (91%) create mode 100644 etl-modules/etl-modules-rule-engine/pom.xml diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/pom.xml b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/pom.xml similarity index 97% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/pom.xml rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/pom.xml index ee551f3..1afa7dd 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/pom.xml +++ b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/pom.xml @@ -9,7 +9,7 @@ 3.6.3 - etl-modules-data-source-system + etl-modules-data-source-server 17 diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/ETLDataSourceApplication.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/ETLDataSourceApplication.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/ETLDataSourceApplication.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/ETLDataSourceApplication.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/controller/DataDictionaryController.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/controller/DataDictionaryController.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/controller/DataDictionaryController.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/controller/DataDictionaryController.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/controller/DataDictionaryTypeController.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/controller/DataDictionaryTypeController.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/controller/DataDictionaryTypeController.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/controller/DataDictionaryTypeController.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryMapper.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryMapper.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryMapper.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryMapper.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryTypeMapper.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryTypeMapper.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryTypeMapper.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/mapper/DataDictionaryTypeMapper.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/service/IDataDictionaryService.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/service/IDataDictionaryService.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/service/IDataDictionaryService.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/service/IDataDictionaryService.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/service/IDataDictionaryTypeService.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/service/IDataDictionaryTypeService.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/service/IDataDictionaryTypeService.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/service/IDataDictionaryTypeService.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/service/impl/DataDictionaryTypeServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/service/impl/DataDictionaryTypeServiceImpl.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/service/impl/DataDictionaryTypeServiceImpl.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/service/impl/DataDictionaryTypeServiceImpl.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/service/impl/IDataDictionaryServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/service/impl/IDataDictionaryServiceImpl.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/dictionary/service/impl/IDataDictionaryServiceImpl.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/dictionary/service/impl/IDataDictionaryServiceImpl.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/controller/DataSourceController.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/source/controller/DataSourceController.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/controller/DataSourceController.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/source/controller/DataSourceController.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/mapper/DataSourceMapper.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/source/mapper/DataSourceMapper.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/mapper/DataSourceMapper.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/source/mapper/DataSourceMapper.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/IDataSourceService.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/source/service/IDataSourceService.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/IDataSourceService.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/source/service/IDataSourceService.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/source/service/impl/DataSourceServiceImpl.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/controller/AssetStructureController.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/controller/AssetStructureController.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/controller/AssetStructureController.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/controller/AssetStructureController.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/controller/AssetStructureTableController.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/controller/AssetStructureTableController.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/controller/AssetStructureTableController.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/controller/AssetStructureTableController.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/controller/AssetTableDetailsController.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/controller/AssetTableDetailsController.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/controller/AssetTableDetailsController.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/controller/AssetTableDetailsController.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/mapper/AssetStructureMapper.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/mapper/AssetStructureMapper.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/mapper/AssetStructureMapper.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/mapper/AssetStructureMapper.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/mapper/AssetStructureTableMapper.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/mapper/AssetStructureTableMapper.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/mapper/AssetStructureTableMapper.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/mapper/AssetStructureTableMapper.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/mapper/AssetTableDetailsMapper.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/mapper/AssetTableDetailsMapper.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/mapper/AssetTableDetailsMapper.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/mapper/AssetTableDetailsMapper.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/IAssetStructureService.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/IAssetStructureService.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/IAssetStructureService.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/IAssetStructureService.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/IAssetStructureTableService.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/IAssetStructureTableService.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/IAssetStructureTableService.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/IAssetStructureTableService.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/IAssetTableDetailsService.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/IAssetTableDetailsService.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/IAssetTableDetailsService.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/IAssetTableDetailsService.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetStructureServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/impl/AssetStructureServiceImpl.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetStructureServiceImpl.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/impl/AssetStructureServiceImpl.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/impl/AssetStructureTableServiceImpl.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/structure/service/impl/AssetTableDetailsServiceImpl.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/controller/DataTypeController.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/type/controller/DataTypeController.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/controller/DataTypeController.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/type/controller/DataTypeController.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/mapper/DataTypeMapper.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/type/mapper/DataTypeMapper.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/mapper/DataTypeMapper.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/type/mapper/DataTypeMapper.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/service/IDataTypeService.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/type/service/IDataTypeService.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/service/IDataTypeService.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/type/service/IDataTypeService.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/java/com/etl/data/type/service/impl/DataTypeServiceImpl.java diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/banner.txt b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/banner.txt similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/banner.txt rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/banner.txt diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/bootstrap.yml b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/bootstrap.yml similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/bootstrap.yml rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/bootstrap.yml diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/logback.xml b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/logback.xml similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/logback.xml rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/logback.xml diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/mapper/data/DataSourceMapper.xml b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/mapper/data/DataSourceMapper.xml similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/mapper/data/DataSourceMapper.xml rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/mapper/data/DataSourceMapper.xml diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/mapper/data/DataTypeMapper.xml b/etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/mapper/data/DataTypeMapper.xml similarity index 100% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/mapper/data/DataTypeMapper.xml rename to etl-modules/etl-modules-data-source/etl-modules-data-source-server/src/main/resources/mapper/data/DataTypeMapper.xml diff --git a/etl-modules/etl-modules-data-source/pom.xml b/etl-modules/etl-modules-data-source/pom.xml index 188c259..f970833 100644 --- a/etl-modules/etl-modules-data-source/pom.xml +++ b/etl-modules/etl-modules-data-source/pom.xml @@ -14,7 +14,7 @@ etl-modules-data-source-common etl-modules-data-source-remote - etl-modules-data-source-system + etl-modules-data-source-server diff --git a/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/pom.xml b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/pom.xml new file mode 100644 index 0000000..b47b55b --- /dev/null +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.etl + etl-modules-rule-engine + 3.6.3 + + + etl-modules-rule-engine-common + + + 17 + 17 + UTF-8 + + + + com.etl + etl-common-core + + + + diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/EngineRule.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/EngineRule.java similarity index 98% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/EngineRule.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/EngineRule.java index 20eddea..63a43b1 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/EngineRule.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/EngineRule.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.domain; +package com.etl.rule.engine.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/EngineRuleVersion.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/EngineRuleVersion.java similarity index 98% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/EngineRuleVersion.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/EngineRuleVersion.java index 14adcd5..dfd8aa0 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/EngineRuleVersion.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/EngineRuleVersion.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.domain; +package com.etl.rule.engine.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/resp/EngineRuleAndEngineRuleVersionResp.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/resp/EngineRuleAndEngineRuleVersionResp.java similarity index 93% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/resp/EngineRuleAndEngineRuleVersionResp.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/resp/EngineRuleAndEngineRuleVersionResp.java index 8161390..b85b26e 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-common/src/main/java/com/etl/data/rule/domain/resp/EngineRuleAndEngineRuleVersionResp.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-common/src/main/java/com/etl/rule/engine/domain/resp/EngineRuleAndEngineRuleVersionResp.java @@ -1,9 +1,9 @@ -package com.etl.data.rule.domain.resp; +package com.etl.rule.engine.domain.resp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.etl.data.rule.domain.EngineRule; -import com.etl.data.rule.domain.EngineRuleVersion; +import com.etl.rule.engine.domain.EngineRule; +import com.etl.rule.engine.domain.EngineRuleVersion; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-remote/pom.xml b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-remote/pom.xml new file mode 100644 index 0000000..442774d --- /dev/null +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-remote/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.etl + etl-modules-rule-engine + 3.6.3 + + + etl-modules-rule-engine-remote + + + 17 + 17 + UTF-8 + + + + com.etl + etl-modules-rule-engine-common + + + + diff --git a/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/pom.xml b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/pom.xml new file mode 100644 index 0000000..34ee872 --- /dev/null +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/pom.xml @@ -0,0 +1,88 @@ + + + 4.0.0 + + com.etl + etl-modules-rule-engine + 3.6.3 + + + etl-modules-rule-engine-server + + + 17 + 17 + UTF-8 + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.etl + etl-common-datasource + + + + + com.etl + etl-common-datascope + + + + + com.etl + etl-common-log + + + + + com.etl + etl-common-swagger + + + + com.etl + etl-modules-rule-engine-common + + + + diff --git a/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/ETLRuleEngineApplication.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/ETLRuleEngineApplication.java new file mode 100644 index 0000000..9747e88 --- /dev/null +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/ETLRuleEngineApplication.java @@ -0,0 +1,24 @@ +package com.etl.rule; + +import com.etl.common.security.annotation.EnableCustomConfig; +import com.etl.common.security.annotation.EnableMyFeignClients; +import com.etl.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableAsync; + +/** + * 数据源模块 + * + * @author Chao + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +@EnableAsync +public class ETLRuleEngineApplication { + public static void main (String[] args) { + SpringApplication.run(ETLRuleEngineApplication.class, args); + } +} diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/classLoading/CustomClassLoader.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/classLoading/CustomClassLoader.java similarity index 88% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/classLoading/CustomClassLoader.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/classLoading/CustomClassLoader.java index e33cdd9..b8934da 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/classLoading/CustomClassLoader.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/classLoading/CustomClassLoader.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.classLoading; +package com.etl.rule.engine.classLoading; /** * 类加载器 diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/controller/EngineRuleController.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/controller/EngineRuleController.java similarity index 85% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/controller/EngineRuleController.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/controller/EngineRuleController.java index 317818b..067103b 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/controller/EngineRuleController.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/controller/EngineRuleController.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.controller; +package com.etl.rule.engine.controller; import com.etl.common.core.domain.Result; import com.etl.common.core.utils.poi.ExcelUtil; @@ -7,9 +7,9 @@ import com.etl.common.core.web.page.TableDataInfo; import com.etl.common.log.annotation.Log; import com.etl.common.log.enums.BusinessType; import com.etl.common.security.annotation.RequiresPermissions; -import com.etl.data.rule.domain.EngineRule; -import com.etl.data.rule.domain.resp.EngineRuleAndEngineRuleVersionResp; -import com.etl.data.rule.service.IEngineRuleService; +import com.etl.rule.engine.domain.EngineRule; +import com.etl.rule.engine.domain.resp.EngineRuleAndEngineRuleVersionResp; +import com.etl.rule.engine.service.IEngineRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,7 +32,7 @@ public class EngineRuleController extends BaseController { /** * 查询引擎维护列表 */ - @RequiresPermissions("data:engine:list") + @RequiresPermissions("rule:engine:list") @GetMapping("/list") public Result> list(EngineRule engineRule) { startPage(); @@ -43,7 +43,7 @@ public class EngineRuleController extends BaseController { /** * 导出引擎维护列表 */ - @RequiresPermissions("data:engine:export") + @RequiresPermissions("rule:engine:export") @Log(title = "引擎维护", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, EngineRule engineRule) { @@ -55,7 +55,7 @@ public class EngineRuleController extends BaseController { /** * 获取引擎维护详细信息 */ - @RequiresPermissions("data:engine:query") + @RequiresPermissions("rule:engine:query") @GetMapping(value = "/{id}") public Result getInfo(@PathVariable("id") Long id) { return success(engineRuleService.selectEngineRuleById(id)); @@ -64,7 +64,7 @@ public class EngineRuleController extends BaseController { /** * 新增引擎维护 */ - @RequiresPermissions("data:engine:add") + @RequiresPermissions("rule:engine:add") @Log(title = "引擎维护", businessType = BusinessType.INSERT) @PostMapping public Result add(@RequestBody EngineRule engineRule) { @@ -74,7 +74,7 @@ public class EngineRuleController extends BaseController { /** * 修改引擎维护 */ - @RequiresPermissions("data:engine:edit") + @RequiresPermissions("rule:engine:edit") @Log(title = "引擎维护", businessType = BusinessType.UPDATE) @PutMapping public Result edit(@RequestBody EngineRule engineRule) { @@ -84,7 +84,7 @@ public class EngineRuleController extends BaseController { /** * 删除引擎维护 */ - @RequiresPermissions("data:engine:remove") + @RequiresPermissions("rule:engine:remove") @Log(title = "引擎维护", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public Result remove(@PathVariable Long[] ids) { @@ -96,7 +96,7 @@ public class EngineRuleController extends BaseController { /** * 修改引擎维护激活 */ - @RequiresPermissions("data:engine:editActivatedOrNot") + @RequiresPermissions("rule:engine:editActivatedOrNot") @Log(title = "引擎维护", businessType = BusinessType.UPDATE) @PutMapping("/editActivatedOrNot") public Result editActivatedOrNot(@RequestBody EngineRule engineRule) { @@ -106,7 +106,7 @@ public class EngineRuleController extends BaseController { /** * 修改引擎维护激活 */ - @RequiresPermissions("data:engine:editStatus") + @RequiresPermissions("rule:engine:editStatus") @Log(title = "引擎维护", businessType = BusinessType.UPDATE) @PutMapping("/editStatus") public Result editStatus(@RequestBody EngineRule engineRule) { @@ -118,7 +118,7 @@ public class EngineRuleController extends BaseController { /** * 获取引擎维护详细信息和版本列表 */ - @RequiresPermissions("data:engine:queryEngineAndEngineVersion") + @RequiresPermissions("rule:engine:queryEngineAndEngineVersion") @GetMapping(value = "queryEngineAndEngineVersion/{id}") public Result queryEngineAndEngineVersion(@PathVariable("id") Long id) { return Result.success(engineRuleService.queryEngineAndEngineVersion(id)); diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/controller/EngineRuleVersionController.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/controller/EngineRuleVersionController.java similarity index 83% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/controller/EngineRuleVersionController.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/controller/EngineRuleVersionController.java index dd8b800..69934ef 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/controller/EngineRuleVersionController.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/controller/EngineRuleVersionController.java @@ -1,11 +1,11 @@ -package com.etl.data.rule.controller; +package com.etl.rule.engine.controller; import com.etl.common.core.domain.Result; import com.etl.common.log.annotation.Log; import com.etl.common.log.enums.BusinessType; import com.etl.common.security.annotation.RequiresPermissions; -import com.etl.data.rule.domain.EngineRuleVersion; -import com.etl.data.rule.service.IEngineRuleVersionService; +import com.etl.rule.engine.domain.EngineRuleVersion; +import com.etl.rule.engine.service.IEngineRuleVersionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,7 +27,7 @@ public class EngineRuleVersionController { /** * 新增引擎维护版本 */ - @RequiresPermissions("data:engineVersion:add") + @RequiresPermissions("rule:engineVersion:add") @Log(title = "引擎维护版本", businessType = BusinessType.INSERT) @PostMapping public Result add(@RequestBody EngineRuleVersion engineRuleVersion) { @@ -37,7 +37,7 @@ public class EngineRuleVersionController { /** * 修改引擎维护版本数据 */ - @RequiresPermissions("data:engine:edit") + @RequiresPermissions("rule:engine:edit") @Log(title = "引擎维护版本", businessType = BusinessType.UPDATE) @PutMapping public Result editStatus(@RequestBody EngineRuleVersion engineRuleVersion) { diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/mapper/EngineRuleMapper.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/mapper/EngineRuleMapper.java similarity index 93% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/mapper/EngineRuleMapper.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/mapper/EngineRuleMapper.java index e88d1df..83a13da 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/mapper/EngineRuleMapper.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/mapper/EngineRuleMapper.java @@ -1,7 +1,7 @@ -package com.etl.data.rule.mapper; +package com.etl.rule.engine.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.etl.data.rule.domain.EngineRule; +import com.etl.rule.engine.domain.EngineRule; import java.util.List; diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/mapper/EngineRuleVersionMapper.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/mapper/EngineRuleVersionMapper.java similarity index 76% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/mapper/EngineRuleVersionMapper.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/mapper/EngineRuleVersionMapper.java index 5faef9e..1aa2b1b 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/mapper/EngineRuleVersionMapper.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/mapper/EngineRuleVersionMapper.java @@ -1,7 +1,7 @@ -package com.etl.data.rule.mapper; +package com.etl.rule.engine.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.etl.data.rule.domain.EngineRuleVersion; +import com.etl.rule.engine.domain.EngineRuleVersion; /** * 引擎维护Mapper接口 diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/DataModelContext.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/DataModelContext.java similarity index 88% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/DataModelContext.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/DataModelContext.java index 22d4e9d..041b97a 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/DataModelContext.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/DataModelContext.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.scope; +package com.etl.rule.engine.scope; /** * @Author: Chao diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/DataSetContext.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/DataSetContext.java similarity index 88% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/DataSetContext.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/DataSetContext.java index ef301e1..a5899e6 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/DataSetContext.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/DataSetContext.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.scope; +package com.etl.rule.engine.scope; /** * @Author: Chao diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/RecordContext.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/RecordContext.java similarity index 87% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/RecordContext.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/RecordContext.java index 8c60a09..567365f 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/RecordContext.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/RecordContext.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.scope; +package com.etl.rule.engine.scope; /** * @Author: Chao diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/TaskContext.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/TaskContext.java similarity index 84% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/TaskContext.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/TaskContext.java index e10d841..8057409 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/scope/TaskContext.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/scope/TaskContext.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.scope; +package com.etl.rule.engine.scope; /** * @Author: Chao diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/IEngineRuleService.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/IEngineRuleService.java similarity index 92% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/IEngineRuleService.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/IEngineRuleService.java index a704b1c..0a849a3 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/IEngineRuleService.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/IEngineRuleService.java @@ -1,9 +1,10 @@ -package com.etl.data.rule.service; +package com.etl.rule.engine.service; + import com.baomidou.mybatisplus.extension.service.IService; import com.etl.common.core.domain.Result; -import com.etl.data.rule.domain.EngineRule; -import com.etl.data.rule.domain.resp.EngineRuleAndEngineRuleVersionResp; +import com.etl.rule.engine.domain.EngineRule; +import com.etl.rule.engine.domain.resp.EngineRuleAndEngineRuleVersionResp; import java.util.List; diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/IEngineRuleVersionService.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/IEngineRuleVersionService.java similarity index 88% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/IEngineRuleVersionService.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/IEngineRuleVersionService.java index 2bae5d4..81227f0 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/IEngineRuleVersionService.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/IEngineRuleVersionService.java @@ -1,7 +1,7 @@ -package com.etl.data.rule.service; +package com.etl.rule.engine.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.etl.data.rule.domain.EngineRuleVersion; +import com.etl.rule.engine.domain.EngineRuleVersion; /** * 引擎维护版本Service接口 diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/impl/EngineRuleServiceImpl.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/impl/EngineRuleServiceImpl.java similarity index 96% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/impl/EngineRuleServiceImpl.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/impl/EngineRuleServiceImpl.java index 49faf9c..0724a7b 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/impl/EngineRuleServiceImpl.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/impl/EngineRuleServiceImpl.java @@ -1,16 +1,17 @@ -package com.etl.data.rule.service.impl; +package com.etl.rule.engine.service.impl; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.etl.common.core.domain.Result; import com.etl.common.core.utils.DateUtils; -import com.etl.data.rule.domain.EngineRule; -import com.etl.data.rule.domain.EngineRuleVersion; -import com.etl.data.rule.domain.resp.EngineRuleAndEngineRuleVersionResp; -import com.etl.data.rule.mapper.EngineRuleMapper; -import com.etl.data.rule.service.IEngineRuleService; -import com.etl.data.rule.service.IEngineRuleVersionService; +import com.etl.rule.engine.domain.EngineRule; +import com.etl.rule.engine.domain.EngineRuleVersion; +import com.etl.rule.engine.domain.resp.EngineRuleAndEngineRuleVersionResp; +import com.etl.rule.engine.mapper.EngineRuleMapper; +import com.etl.rule.engine.service.IEngineRuleService; +import com.etl.rule.engine.service.IEngineRuleVersionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +37,7 @@ import java.util.stream.Collectors; */ @Service public class EngineRuleServiceImpl extends ServiceImpl implements IEngineRuleService { + @Autowired private EngineRuleMapper engineRuleMapper; diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/impl/EngineRuleVersionServiceImpl.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/impl/EngineRuleVersionServiceImpl.java similarity index 86% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/impl/EngineRuleVersionServiceImpl.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/impl/EngineRuleVersionServiceImpl.java index adb4f3f..50883e8 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/service/impl/EngineRuleVersionServiceImpl.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/service/impl/EngineRuleVersionServiceImpl.java @@ -1,13 +1,12 @@ -package com.etl.data.rule.service.impl; +package com.etl.rule.engine.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.etl.data.rule.domain.EngineRuleVersion; -import com.etl.data.rule.mapper.EngineRuleVersionMapper; -import com.etl.data.rule.service.IEngineRuleVersionService; +import com.etl.rule.engine.domain.EngineRuleVersion; +import com.etl.rule.engine.mapper.EngineRuleVersionMapper; +import com.etl.rule.engine.service.IEngineRuleVersionService; import org.springframework.stereotype.Service; - /** * 引擎维护版本Service业务层处理 * diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/DynamicCompilation.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/DynamicCompilation.java similarity index 98% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/DynamicCompilation.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/DynamicCompilation.java index 29f900e..a3db3de 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/DynamicCompilation.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/DynamicCompilation.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.utils; +package com.etl.rule.engine.utils; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/DynamicCompilationExample.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/DynamicCompilationExample.java similarity index 98% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/DynamicCompilationExample.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/DynamicCompilationExample.java index 0febf5a..8b355cb 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/DynamicCompilationExample.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/DynamicCompilationExample.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.utils; +package com.etl.rule.engine.utils; import javax.tools.*; diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/JavaSourceFromString.java b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/JavaSourceFromString.java similarity index 95% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/JavaSourceFromString.java rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/JavaSourceFromString.java index 6165943..ace6525 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/java/com/etl/data/rule/utils/JavaSourceFromString.java +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/java/com/etl/rule/engine/utils/JavaSourceFromString.java @@ -1,4 +1,4 @@ -package com.etl.data.rule.utils; +package com.etl.rule.engine.utils; import javax.tools.SimpleJavaFileObject; import java.net.URI; diff --git a/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/banner.txt b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/bootstrap.yml b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..3e828f7 --- /dev/null +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/bootstrap.yml @@ -0,0 +1,35 @@ +# Tomcat +server: + port: 9303 + +# Spring +spring: + application: + # 应用名称 + name: etl-rule-engine + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.23.133:8848 + # 命名空间 + namespace: etl + config: + # 配置中心地址 + server-addr: 192.168.23.133:8848 + # 命名空间 + namespace: etl + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 主启动类 允许循环依赖 + main: + allow-circular-references: true +logging: + level: + com.etl.system.mapper: DEBUG diff --git a/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/logback.xml b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/logback.xml new file mode 100644 index 0000000..ed5d1de --- /dev/null +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/mapper/data/EngineRuleMapper.xml b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/mapper/rule/EngineRuleMapper.xml similarity index 91% rename from etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/mapper/data/EngineRuleMapper.xml rename to etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/mapper/rule/EngineRuleMapper.xml index 29d7ee9..951154e 100644 --- a/etl-modules/etl-modules-data-source/etl-modules-data-source-system/src/main/resources/mapper/data/EngineRuleMapper.xml +++ b/etl-modules/etl-modules-rule-engine/etl-modules-rule-engine-server/src/main/resources/mapper/rule/EngineRuleMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, name, type, scope, encoding, activated_or_not, status, description, remark, code_text, create_by, create_time, update_by, update_time from engine_rule - and name like concat('%', #{name}, '%') @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into engine_rule name, @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update engine_rule name = #{name}, diff --git a/etl-modules/etl-modules-rule-engine/pom.xml b/etl-modules/etl-modules-rule-engine/pom.xml new file mode 100644 index 0000000..cbce43a --- /dev/null +++ b/etl-modules/etl-modules-rule-engine/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.etl + etl-modules + 3.6.3 + + + etl-modules-rule-engine + pom + + etl-modules-rule-engine-common + etl-modules-rule-engine-remote + etl-modules-rule-engine-server + + + + 17 + 17 + UTF-8 + + + etl-modules-rule-engine 规则引擎模块 + + + diff --git a/etl-modules/pom.xml b/etl-modules/pom.xml index 68ef16f..acf659b 100644 --- a/etl-modules/pom.xml +++ b/etl-modules/pom.xml @@ -14,6 +14,7 @@ etl-modules-job etl-modules-file etl-modules-data-source + etl-modules-rule-engine etl-modules diff --git a/pom.xml b/pom.xml index d6f613e..8668c5b 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,20 @@ ${etl.version} + + + com.etl + etl-modules-rule-engine-common + ${etl.version} + + + + + com.etl + etl-modules-rule-engine-remote + ${etl.version} + + redis.clients jedis