From 81c128911152e6b46295afac8c852ad8bf301576 Mon Sep 17 00:00:00 2001
From: gtl <2949451835@qq.com>
Date: Thu, 9 May 2024 08:48:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E8=B5=84=E4=BA=A7=E5=AE=A2=E6=88=B7=E7=AB=AF,?=
=?UTF-8?q?=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E=E5=AE=A2=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../core/constant/ServiceNameConstants.java | 9 +-
ruoyi-modules/pom.xml | 1 +
ruoyi-modules/ruoyi-data_asset/pom.xml | 1 +
.../ruoyi-data_asset-client/pom.xml | 27 +++++
.../config/DataAssetApplicationRunner.java | 34 ++++++
.../config/DataAssetClientConfig.java | 15 +++
...ot.autoconfigure.AutoConfiguration.imports | 1 +
.../ruoyi-data_asset-common/pom.xml | 1 +
.../ruoyi-data_asset-remote/pom.xml | 14 ++-
.../remote/RemoteDataAssetService.java | 32 ++++++
.../factory/RemoteDataAssetFactory.java | 27 +++++
...ot.autoconfigure.AutoConfiguration.imports | 1 +
.../src/main/resources/logback.xml | 2 +-
ruoyi-modules/ruoyi-data_transform/pom.xml | 102 ++++++++++++++++++
.../GtlDataTransformApplication.java | 23 ++++
.../src/main/resources/banner.txt | 8 ++
.../src/main/resources/bootstrap.yml | 30 ++++++
.../src/main/resources/logback.xml | 74 +++++++++++++
ruoyi-modules/ruoyi-rule_engine/pom.xml | 1 +
.../ruoyi-rule_engine-client/pom.xml | 27 +++++
.../config/RuleEngineApplicationRunner.java | 34 ++++++
.../client/config/RuleEngineClientConfig.java | 16 +++
...ot.autoconfigure.AutoConfiguration.imports | 1 +
.../constant/ConfigCodeConstants.java | 2 +-
.../constant/EngineVersionConstants.java | 2 +-
.../constant/RuleOperationConstants.java | 2 +-
.../context/DataModelContextHolder.java | 4 +-
.../context/DataSetContextHolder.java | 4 +-
.../context/RecordContextHolder.java | 4 +-
.../context/TaskContextHolder.java | 2 +-
.../context/engine_custom.txt | 2 +-
.../domain/EngineMaintenance.java | 8 +-
.../domain/EngineVersion.java | 8 +-
.../domain/model/TestData.java | 2 +-
.../domain/req/EngineMaintenanceEditReq.java | 2 +-
.../domain/req/EngineMaintenanceQueryReq.java | 2 +-
.../domain/req/EngineMaintenanceSaveReq.java | 2 +-
.../domain/req/EngineVersionEditReq.java | 2 +-
.../domain/req/EngineVersionQueryReq.java | 2 +-
.../domain/req/EngineVersionSaveReq.java | 2 +-
.../domain/req/VersionClassCreateReq.java | 2 +-
.../domain/resp/EngineConfigScopeResp.java | 2 +-
.../domain/resp/VersionClassCreateResp.java | 2 +-
.../dynamicLoad/DynamicLoader.java | 2 +-
.../dynamicLoad/MemoryJavaFileManager.java | 2 +-
.../engine/Engine.java | 2 +-
.../engine/action/ActionDiscard.java | 2 +-
.../engine/custom/IsNotNullEngineCustom.java | 6 +-
.../engine/scope/DataModelEngine.java | 10 +-
.../engine/scope/DataSetEngine.java | 12 +--
.../engine/scope/RecordEngine.java | 12 +--
.../model/DataModel.java | 2 +-
.../model/DataSetModel.java | 2 +-
.../model/RecordModel.java | 2 +-
.../model/process/DataModelProcessModel.java | 4 +-
.../model/process/DataSetProcessModel.java | 4 +-
.../model/process/RecordProcessModel.java | 4 +-
.../util/ScopeContextHolderUtil.java | 12 +--
.../ruoyi-rule_engine-remote/pom.xml | 14 ++-
.../remote/RemoteRuleEngineService.java | 33 ++++++
.../factory/RemoteRuleEngineFactory.java | 26 +++++
...ot.autoconfigure.AutoConfiguration.imports | 1 +
.../ruoyi-rule_engine-server/pom.xml | 2 +-
.../GtlRuleEngineApplication.java | 2 +-
.../controller/EngineConfigController.java | 6 +-
.../EngineMaintenanceController.java | 12 +--
.../controller/EngineVersionController.java | 18 ++--
.../mapper/EngineMaintenanceMapper.java | 4 +-
.../mapper/EngineVersionMapper.java | 4 +-
.../service/EngineConfigService.java | 4 +-
.../service/EngineMaintenanceService.java | 4 +-
.../service/EngineVersionService.java | 10 +-
.../service/impl/EngineConfigServiceImpl.java | 8 +-
.../impl/EngineMaintenanceServiceImpl.java | 12 +--
.../impl/EngineVersionServiceImpl.java | 24 ++---
.../src/main/resources/bootstrap.yml | 2 +-
.../src/main/resources/logback.xml | 2 +-
77 files changed, 675 insertions(+), 130 deletions(-)
create mode 100644 ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/pom.xml
create mode 100644 ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/config/DataAssetApplicationRunner.java
create mode 100644 ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/config/DataAssetClientConfig.java
create mode 100644 ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
create mode 100644 ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/java/com/ruoyi/dataAsset/remote/RemoteDataAssetService.java
create mode 100644 ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/java/com/ruoyi/dataAsset/remote/factory/RemoteDataAssetFactory.java
create mode 100644 ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
create mode 100644 ruoyi-modules/ruoyi-data_transform/pom.xml
create mode 100644 ruoyi-modules/ruoyi-data_transform/src/main/java/com/ruoyi/dataTransform/GtlDataTransformApplication.java
create mode 100644 ruoyi-modules/ruoyi-data_transform/src/main/resources/banner.txt
create mode 100644 ruoyi-modules/ruoyi-data_transform/src/main/resources/bootstrap.yml
create mode 100644 ruoyi-modules/ruoyi-data_transform/src/main/resources/logback.xml
create mode 100644 ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/pom.xml
create mode 100644 ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/dataAsset/client/config/RuleEngineApplicationRunner.java
create mode 100644 ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/dataAsset/client/config/RuleEngineClientConfig.java
create mode 100644 ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/constant/ConfigCodeConstants.java (95%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/constant/EngineVersionConstants.java (95%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/constant/RuleOperationConstants.java (91%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/context/DataModelContextHolder.java (89%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/context/DataSetContextHolder.java (89%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/context/RecordContextHolder.java (89%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/context/TaskContextHolder.java (84%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/context/engine_custom.txt (79%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/EngineMaintenance.java (94%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/EngineVersion.java (95%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/model/TestData.java (87%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/req/EngineMaintenanceEditReq.java (96%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/req/EngineMaintenanceQueryReq.java (96%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/req/EngineMaintenanceSaveReq.java (97%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/req/EngineVersionEditReq.java (97%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/req/EngineVersionQueryReq.java (97%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/req/EngineVersionSaveReq.java (97%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/req/VersionClassCreateReq.java (96%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/resp/EngineConfigScopeResp.java (91%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/domain/resp/VersionClassCreateResp.java (93%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/dynamicLoad/DynamicLoader.java (98%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/dynamicLoad/MemoryJavaFileManager.java (99%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/engine/Engine.java (82%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/engine/action/ActionDiscard.java (78%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/engine/custom/IsNotNullEngineCustom.java (71%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/engine/scope/DataModelEngine.java (75%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/engine/scope/DataSetEngine.java (62%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/engine/scope/RecordEngine.java (65%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/model/DataModel.java (94%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/model/DataSetModel.java (90%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/model/RecordModel.java (90%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/model/process/DataModelProcessModel.java (71%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/model/process/DataSetProcessModel.java (77%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/model/process/RecordProcessModel.java (74%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/util/ScopeContextHolderUtil.java (86%)
create mode 100644 ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/java/com/ruoyi/dataAsset/remote/RemoteRuleEngineService.java
create mode 100644 ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/java/com/ruoyi/dataAsset/remote/factory/RemoteRuleEngineFactory.java
create mode 100644 ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/GtlRuleEngineApplication.java (95%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/controller/EngineConfigController.java (89%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/controller/EngineMaintenanceController.java (93%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/controller/EngineVersionController.java (87%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/mapper/EngineMaintenanceMapper.java (70%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/mapper/EngineVersionMapper.java (71%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/service/EngineConfigService.java (83%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/service/EngineMaintenanceService.java (90%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/service/EngineVersionService.java (75%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/service/impl/EngineConfigServiceImpl.java (90%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/service/impl/EngineMaintenanceServiceImpl.java (91%)
rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/{ruleEngine => dataAsset}/service/impl/EngineVersionServiceImpl.java (85%)
diff --git a/ruoyi-common/muyu-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/muyu-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
index a01b1cb..6196fb9 100644
--- a/ruoyi-common/muyu-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
+++ b/ruoyi-common/muyu-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
@@ -22,7 +22,12 @@ public class ServiceNameConstants {
public static final String FILE_SERVICE = "ruoyi-file";
/**
- * 商品服务的serviceid
+ * 数据接入服务的serviceid
*/
- public static final String PRODUCT_SERVICE = "ruoyi-product";
+ public static final String DATA_ACCESS_SERVICE = "ruoyi-data-asset";
+
+ /**
+ * 规则引擎服务的serviceid
+ */
+ public static final String RULE_ENGINE_SERVICE = "ruoyi-rule-engine";
}
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index ef8713b..881160b 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -15,6 +15,7 @@
ruoyi-file
ruoyi-data_asset
ruoyi-rule_engine
+ ruoyi-data_transform
ruoyi-modules
diff --git a/ruoyi-modules/ruoyi-data_asset/pom.xml b/ruoyi-modules/ruoyi-data_asset/pom.xml
index 4e926ab..1e40dc7 100644
--- a/ruoyi-modules/ruoyi-data_asset/pom.xml
+++ b/ruoyi-modules/ruoyi-data_asset/pom.xml
@@ -18,6 +18,7 @@
ruoyi-data_asset-common
ruoyi-data_asset-remote
ruoyi-data_asset-server
+ ruoyi-data_asset-client
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/pom.xml b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/pom.xml
new file mode 100644
index 0000000..5427789
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/pom.xml
@@ -0,0 +1,27 @@
+
+
+ 4.0.0
+
+ com.muyu
+ ruoyi-data_asset
+ 3.6.3
+
+
+ com.ruoyi
+ ruoyi-data_asset-client
+ ruoyi-data_asset-client数据资产客户端模块
+
+ 17
+ 17
+ UTF-8
+
+
+
+ com.muyu
+ ruoyi-data_asset-remote
+ 3.6.3
+
+
+
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/config/DataAssetApplicationRunner.java b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/config/DataAssetApplicationRunner.java
new file mode 100644
index 0000000..817b301
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/config/DataAssetApplicationRunner.java
@@ -0,0 +1,34 @@
+package com.ruoyi.dataAsset.config;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.dataAsset.domain.DataSource;
+import com.ruoyi.dataAsset.domain.req.DataSourceQueryReq;
+import com.ruoyi.dataAsset.remote.RemoteDataAssetService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+
+/**
+ * 数据资产应用程序运行程序
+ * @ClassName DataAssetApplicationRunner
+ * @Author 森静若林
+ * @Date 2024/5/8 20:41
+ */
+@Log4j2
+public class DataAssetApplicationRunner implements ApplicationRunner {
+
+ @Autowired
+ private RemoteDataAssetService remoteDataAssetService;
+
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ Result> result = remoteDataAssetService.list(new DataSourceQueryReq());
+ if(Result.isSuccess(result)){
+ log.info(result.getData());
+ }else {
+ log.error(result.getMsg());
+ }
+ }
+}
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/config/DataAssetClientConfig.java b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/config/DataAssetClientConfig.java
new file mode 100644
index 0000000..0f5ac75
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/java/com/ruoyi/dataAsset/config/DataAssetClientConfig.java
@@ -0,0 +1,15 @@
+package com.ruoyi.dataAsset.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
+
+/**
+ * 数据资产客户端配置
+ * @ClassName DataAssetClientConfig
+ * @Author 森静若林
+ * @Date 2024/5/8 20:30
+ */
+@ComponentScan
+@Import(DataAssetApplicationRunner.class)
+public class DataAssetClientConfig {
+}
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..44754d7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.ruoyi.dataAsset.config.DataAssetClientConfig
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-common/pom.xml b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-common/pom.xml
index 48877e3..4ce2370 100644
--- a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-common/pom.xml
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-common/pom.xml
@@ -24,6 +24,7 @@
com.muyu
muyu-common-core
+
com.alibaba
druid
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/pom.xml b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/pom.xml
index 106b09a..8cc050a 100644
--- a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/pom.xml
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/pom.xml
@@ -18,5 +18,17 @@
17
UTF-8
-
+
+
+
+ com.muyu
+ ruoyi-data_asset-common
+ 3.6.3
+
+
+
+ com.muyu
+ muyu-common-security
+
+
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/java/com/ruoyi/dataAsset/remote/RemoteDataAssetService.java b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/java/com/ruoyi/dataAsset/remote/RemoteDataAssetService.java
new file mode 100644
index 0000000..06667ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/java/com/ruoyi/dataAsset/remote/RemoteDataAssetService.java
@@ -0,0 +1,32 @@
+package com.ruoyi.dataAsset.remote;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.dataAsset.domain.DataSource;
+import com.ruoyi.dataAsset.domain.req.DataSourceQueryReq;
+import com.ruoyi.dataAsset.remote.factory.RemoteDataAssetFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 数据资产远程调用业务层
+ * @ClassName RemoteDataAssetService
+ * @Author 森静若林
+ * @Date 2024/5/7 13:54
+ */
+@FeignClient(
+ contextId = "remoteDataAssetService",
+ value = ServiceNameConstants.DATA_ACCESS_SERVICE,
+ fallbackFactory = RemoteDataAssetFactory.class,
+ path = "/source"
+)
+public interface RemoteDataAssetService {
+ /**
+ * 查询数据接入列表
+ */
+ @GetMapping("/list")
+ public Result> list(@RequestParam("dataSourceQueryReq") DataSourceQueryReq dataSourceQueryReq);
+}
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/java/com/ruoyi/dataAsset/remote/factory/RemoteDataAssetFactory.java b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/java/com/ruoyi/dataAsset/remote/factory/RemoteDataAssetFactory.java
new file mode 100644
index 0000000..6e7c5ba
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/java/com/ruoyi/dataAsset/remote/factory/RemoteDataAssetFactory.java
@@ -0,0 +1,27 @@
+package com.ruoyi.dataAsset.remote.factory;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.dataAsset.domain.DataSource;
+import com.ruoyi.dataAsset.domain.req.DataSourceQueryReq;
+import com.ruoyi.dataAsset.remote.RemoteDataAssetService;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+/**
+ * 数据资产远程调用熔断器
+ * @ClassName RemoteDataAssetFactory
+ * @Author 森静若林
+ * @Date 2024/5/7 11:59
+ */
+public class RemoteDataAssetFactory implements FallbackFactory {
+ @Override
+ public RemoteDataAssetService create(Throwable cause) {
+ return new RemoteDataAssetService() {
+
+ @Override
+ public Result> list(DataSourceQueryReq dataSourceQueryReq) {
+ return Result.error(cause.getMessage());
+ }
+ };
+ }
+}
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..20534e5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.ruoyi.dataAsset.remote.factory.RemoteDataAssetFactory
diff --git a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-server/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-server/src/main/resources/logback.xml
index dbf865c..c5b2d2a 100644
--- a/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-server/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-data_asset/ruoyi-data_asset-server/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/ruoyi-modules/ruoyi-data_transform/pom.xml b/ruoyi-modules/ruoyi-data_transform/pom.xml
new file mode 100644
index 0000000..1b609be
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_transform/pom.xml
@@ -0,0 +1,102 @@
+
+
+ 4.0.0
+
+ com.muyu
+ ruoyi-modules
+ 3.6.3
+
+
+ ruoyi-data_transform
+ ruoyi-data_transform数据转换模块
+
+ 17
+ 17
+ UTF-8
+
+
+
+
+ com.muyu
+ muyu-common-security
+
+
+
+
+ com.muyu
+ muyu-common-swagger
+
+
+
+
+ com.ruoyi
+ ruoyi-data_asset-client
+ 3.6.3
+
+
+
+
+ com.ruoyi
+ ruoyi-rule_engine-client
+ 3.6.3
+
+
+
+
+ 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.muyu
+ muyu-common-datascope
+
+
+
+
+ com.muyu
+ muyu-common-swagger
+
+
+
+
+ com.microsoft.sqlserver
+ mssql-jdbc
+ 9.4.0.jre8
+
+
+
diff --git a/ruoyi-modules/ruoyi-data_transform/src/main/java/com/ruoyi/dataTransform/GtlDataTransformApplication.java b/ruoyi-modules/ruoyi-data_transform/src/main/java/com/ruoyi/dataTransform/GtlDataTransformApplication.java
new file mode 100644
index 0000000..a667d2a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_transform/src/main/java/com/ruoyi/dataTransform/GtlDataTransformApplication.java
@@ -0,0 +1,23 @@
+package com.ruoyi.dataTransform;
+
+import com.ruoyi.common.security.annotation.EnableCustomConfig;
+import com.ruoyi.common.security.annotation.EnableMyFeignClients;
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * data_transform 服务模块
+ *
+ * @author gtl
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+public class GtlDataTransformApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(GtlDataTransformApplication.class,args);
+ }
+}
diff --git a/ruoyi-modules/ruoyi-data_transform/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-data_transform/src/main/resources/banner.txt
new file mode 100644
index 0000000..b9d8703
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_transform/src/main/resources/banner.txt
@@ -0,0 +1,8 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ __ .__ .__
+ ____ _/ |_ | | _______ __ __ ____ ___.__.|__|
+ / ___\ \ __\| | ______ \_ __ \| | \ / _ \ < | || |
+ / /_/ > | | | |__ /_____/ | | \/| | /( <_> ) \___ || |
+ \___ / |__| |____/ |__| |____/ \____/ / ____||__|
+/_____/ \/
diff --git a/ruoyi-modules/ruoyi-data_transform/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-data_transform/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..39fb8b3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_transform/src/main/resources/bootstrap.yml
@@ -0,0 +1,30 @@
+# Tomcat
+server:
+ port: 9206
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: ruoyi-data-transform
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 47.98.98.250:8848
+ namespace: 143f1a53-e544-4782-8667-877c532e2c66
+ config:
+ # 配置中心地址
+ server-addr: 47.98.98.250:8848
+ namespace: 143f1a53-e544-4782-8667-877c532e2c66
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+logging:
+ level:
+ com.ruoyi.dataTransform.mapper: DEBUG
diff --git a/ruoyi-modules/ruoyi-data_transform/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-data_transform/src/main/resources/logback.xml
new file mode 100644
index 0000000..18ed6ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-data_transform/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/ruoyi-modules/ruoyi-rule_engine/pom.xml b/ruoyi-modules/ruoyi-rule_engine/pom.xml
index b1e2431..99ac0ce 100644
--- a/ruoyi-modules/ruoyi-rule_engine/pom.xml
+++ b/ruoyi-modules/ruoyi-rule_engine/pom.xml
@@ -18,6 +18,7 @@
ruoyi-rule_engine-common
ruoyi-rule_engine-remote
ruoyi-rule_engine-server
+ ruoyi-rule_engine-client
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/pom.xml b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/pom.xml
new file mode 100644
index 0000000..bba2b77
--- /dev/null
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/pom.xml
@@ -0,0 +1,27 @@
+
+
+ 4.0.0
+
+ com.muyu
+ ruoyi-rule_engine
+ 3.6.3
+
+
+ com.ruoyi
+ ruoyi-rule_engine-client
+ ruoyi-rule_engine-client规则引擎客户端
+
+ 17
+ 17
+ UTF-8
+
+
+
+ com.muyu
+ ruoyi-rule_engine-remote
+ 3.6.3
+
+
+
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/dataAsset/client/config/RuleEngineApplicationRunner.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/dataAsset/client/config/RuleEngineApplicationRunner.java
new file mode 100644
index 0000000..c3756aa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/dataAsset/client/config/RuleEngineApplicationRunner.java
@@ -0,0 +1,34 @@
+package com.ruoyi.dataAsset.client.config;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.dataAsset.domain.EngineVersion;
+import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
+import com.ruoyi.dataAsset.remote.RemoteRuleEngineService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import java.util.List;
+
+/**
+ * 规则引擎应用程序运行程序
+ * @ClassName RuleEngineApplicationRunner
+ * @Author 森静若林
+ * @Date 2024/5/8 19:36
+ */
+@Log4j2
+public class RuleEngineApplicationRunner implements ApplicationRunner {
+
+ @Autowired
+ private RemoteRuleEngineService remoteRuleEngineService;
+
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ Result> result = remoteRuleEngineService.list(new EngineVersionQueryReq());
+ if(Result.isSuccess(result)){
+ log.info(result.getData());
+ }else {
+ log.error(result.getMsg());
+ }
+ }
+}
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/dataAsset/client/config/RuleEngineClientConfig.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/dataAsset/client/config/RuleEngineClientConfig.java
new file mode 100644
index 0000000..ec8c432
--- /dev/null
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/java/com/ruoyi/dataAsset/client/config/RuleEngineClientConfig.java
@@ -0,0 +1,16 @@
+package com.ruoyi.dataAsset.client.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
+
+/**
+ * 规则引擎客户端配置
+ * @ClassName RuleEngineClientConfig
+ * @Author 森静若林
+ * @Date 2024/5/8 19:31
+ */
+@ComponentScan
+@Import(RuleEngineApplicationRunner.class)
+public class RuleEngineClientConfig {
+
+}
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..676fb29
--- /dev/null
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.ruoyi.dataAsset.client.config.RuleEngineClientConfig
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/ConfigCodeConstants.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/ConfigCodeConstants.java
similarity index 95%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/ConfigCodeConstants.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/ConfigCodeConstants.java
index de90592..ba0274c 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/ConfigCodeConstants.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/ConfigCodeConstants.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.constant;
+package com.ruoyi.dataAsset.constant;
/**
* 配置编码常量
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/EngineVersionConstants.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/EngineVersionConstants.java
similarity index 95%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/EngineVersionConstants.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/EngineVersionConstants.java
index 4930ccd..e77573b 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/EngineVersionConstants.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/EngineVersionConstants.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.constant;
+package com.ruoyi.dataAsset.constant;
/**
* 引擎版本常量
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/RuleOperationConstants.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/RuleOperationConstants.java
similarity index 91%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/RuleOperationConstants.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/RuleOperationConstants.java
index 1f9666f..4767654 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/constant/RuleOperationConstants.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/constant/RuleOperationConstants.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.constant;
+package com.ruoyi.dataAsset.constant;
/**
* 规则运行常量
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/DataModelContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/DataModelContextHolder.java
similarity index 89%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/DataModelContextHolder.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/DataModelContextHolder.java
index 8ddb94f..dfc569f 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/DataModelContextHolder.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/DataModelContextHolder.java
@@ -1,6 +1,6 @@
-package com.ruoyi.ruleEngine.context;
+package com.ruoyi.dataAsset.context;
-import com.ruoyi.ruleEngine.model.process.DataModelProcessModel;
+import com.ruoyi.dataAsset.model.process.DataModelProcessModel;
import lombok.Data;
import lombok.experimental.SuperBuilder;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/DataSetContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/DataSetContextHolder.java
similarity index 89%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/DataSetContextHolder.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/DataSetContextHolder.java
index 974fecd..bb5c426 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/DataSetContextHolder.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/DataSetContextHolder.java
@@ -1,6 +1,6 @@
-package com.ruoyi.ruleEngine.context;
+package com.ruoyi.dataAsset.context;
-import com.ruoyi.ruleEngine.model.process.DataSetProcessModel;
+import com.ruoyi.dataAsset.model.process.DataSetProcessModel;
import lombok.Data;
import lombok.experimental.SuperBuilder;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/RecordContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/RecordContextHolder.java
similarity index 89%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/RecordContextHolder.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/RecordContextHolder.java
index 778ab75..807cd69 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/RecordContextHolder.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/RecordContextHolder.java
@@ -1,6 +1,6 @@
-package com.ruoyi.ruleEngine.context;
+package com.ruoyi.dataAsset.context;
-import com.ruoyi.ruleEngine.model.process.RecordProcessModel;
+import com.ruoyi.dataAsset.model.process.RecordProcessModel;
import lombok.Data;
import lombok.experimental.SuperBuilder;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/TaskContextHolder.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/TaskContextHolder.java
similarity index 84%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/TaskContextHolder.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/TaskContextHolder.java
index 285cc86..92774ff 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/TaskContextHolder.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/TaskContextHolder.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.context;
+package com.ruoyi.dataAsset.context;
/**
* 任务上下文
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/engine_custom.txt b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/engine_custom.txt
similarity index 79%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/engine_custom.txt
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/engine_custom.txt
index 9ea6ec7..32ce930 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/context/engine_custom.txt
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/context/engine_custom.txt
@@ -1,4 +1,4 @@
-import com.ruoyi.ruleEngine.engine.scope.scope_engine;
+import com.ruoyi.dataAsset.engine.scope.scope_engine;
/**
* 自定义引擎
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineMaintenance.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/EngineMaintenance.java
similarity index 94%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineMaintenance.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/EngineMaintenance.java
index 784cbea..97dca50 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineMaintenance.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/EngineMaintenance.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain;
+package com.ruoyi.dataAsset.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,9 +10,9 @@ import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceQueryReq;
-import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceSaveReq;
-import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceEditReq;
+import com.ruoyi.dataAsset.domain.req.EngineMaintenanceQueryReq;
+import com.ruoyi.dataAsset.domain.req.EngineMaintenanceSaveReq;
+import com.ruoyi.dataAsset.domain.req.EngineMaintenanceEditReq;
import com.ruoyi.common.core.web.domain.BaseEntity;
import java.util.function.Supplier;
import java.util.Date;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineVersion.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/EngineVersion.java
similarity index 95%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineVersion.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/EngineVersion.java
index b4064d9..a44a901 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineVersion.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/EngineVersion.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain;
+package com.ruoyi.dataAsset.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,9 +10,9 @@ import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*;
import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
-import com.ruoyi.ruleEngine.domain.req.EngineVersionSaveReq;
-import com.ruoyi.ruleEngine.domain.req.EngineVersionEditReq;
+import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
+import com.ruoyi.dataAsset.domain.req.EngineVersionSaveReq;
+import com.ruoyi.dataAsset.domain.req.EngineVersionEditReq;
import com.ruoyi.common.core.web.domain.BaseEntity;
import java.util.function.Supplier;
import java.util.Date;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/model/TestData.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/model/TestData.java
similarity index 87%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/model/TestData.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/model/TestData.java
index e34f68b..b930243 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/model/TestData.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/model/TestData.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.model;
+package com.ruoyi.dataAsset.domain.model;
import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceEditReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceEditReq.java
similarity index 96%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceEditReq.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceEditReq.java
index 6126373..4e1b35c 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceEditReq.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceEditReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.req;
+package com.ruoyi.dataAsset.domain.req;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceQueryReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceQueryReq.java
similarity index 96%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceQueryReq.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceQueryReq.java
index 2d5b5c1..a65c5b1 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceQueryReq.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceQueryReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.req;
+package com.ruoyi.dataAsset.domain.req;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceSaveReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceSaveReq.java
similarity index 97%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceSaveReq.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceSaveReq.java
index 5312d53..7424a65 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineMaintenanceSaveReq.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineMaintenanceSaveReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.req;
+package com.ruoyi.dataAsset.domain.req;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionEditReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionEditReq.java
similarity index 97%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionEditReq.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionEditReq.java
index 1bba474..ce07d60 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionEditReq.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionEditReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.req;
+package com.ruoyi.dataAsset.domain.req;
import com.ruoyi.common.core.annotation.Excel;
import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionQueryReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionQueryReq.java
similarity index 97%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionQueryReq.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionQueryReq.java
index e863df9..c6e3e05 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionQueryReq.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionQueryReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.req;
+package com.ruoyi.dataAsset.domain.req;
import com.ruoyi.common.core.annotation.Excel;
import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionSaveReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionSaveReq.java
similarity index 97%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionSaveReq.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionSaveReq.java
index a30a487..197dba1 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionSaveReq.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/EngineVersionSaveReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.req;
+package com.ruoyi.dataAsset.domain.req;
import com.ruoyi.common.core.annotation.Excel;
import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/VersionClassCreateReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/VersionClassCreateReq.java
similarity index 96%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/VersionClassCreateReq.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/VersionClassCreateReq.java
index cd0fb19..b4e9ee1 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/VersionClassCreateReq.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/req/VersionClassCreateReq.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.req;
+package com.ruoyi.dataAsset.domain.req;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/resp/EngineConfigScopeResp.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/resp/EngineConfigScopeResp.java
similarity index 91%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/resp/EngineConfigScopeResp.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/resp/EngineConfigScopeResp.java
index d8bc0aa..d9af344 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/resp/EngineConfigScopeResp.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/resp/EngineConfigScopeResp.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.resp;
+package com.ruoyi.dataAsset.domain.resp;
import lombok.Data;
import lombok.experimental.SuperBuilder;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/resp/VersionClassCreateResp.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/resp/VersionClassCreateResp.java
similarity index 93%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/resp/VersionClassCreateResp.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/resp/VersionClassCreateResp.java
index a2daebe..0ec3c5c 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/resp/VersionClassCreateResp.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/domain/resp/VersionClassCreateResp.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.domain.resp;
+package com.ruoyi.dataAsset.domain.resp;
import lombok.AllArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/dynamicLoad/DynamicLoader.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/dynamicLoad/DynamicLoader.java
similarity index 98%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/dynamicLoad/DynamicLoader.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/dynamicLoad/DynamicLoader.java
index 47d05aa..8bac342 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/dynamicLoad/DynamicLoader.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/dynamicLoad/DynamicLoader.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.dynamicLoad;
+package com.ruoyi.dataAsset.dynamicLoad;
import java.io.IOException;
import java.net.URL;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/dynamicLoad/MemoryJavaFileManager.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/dynamicLoad/MemoryJavaFileManager.java
similarity index 99%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/dynamicLoad/MemoryJavaFileManager.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/dynamicLoad/MemoryJavaFileManager.java
index aa784d7..d6e4ddd 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/dynamicLoad/MemoryJavaFileManager.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/dynamicLoad/MemoryJavaFileManager.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.dynamicLoad;
+package com.ruoyi.dataAsset.dynamicLoad;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/Engine.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/Engine.java
similarity index 82%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/Engine.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/Engine.java
index a6722fd..da86fdf 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/Engine.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/Engine.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.engine;
+package com.ruoyi.dataAsset.engine;
/**
* 引擎
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/action/ActionDiscard.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/action/ActionDiscard.java
similarity index 78%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/action/ActionDiscard.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/action/ActionDiscard.java
index 3316ce4..4e02662 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/action/ActionDiscard.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/action/ActionDiscard.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.engine.action;
+package com.ruoyi.dataAsset.engine.action;
/**
* 丢弃动作
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/custom/IsNotNullEngineCustom.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/custom/IsNotNullEngineCustom.java
similarity index 71%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/custom/IsNotNullEngineCustom.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/custom/IsNotNullEngineCustom.java
index 8ee85d4..ce7bd49 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/custom/IsNotNullEngineCustom.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/custom/IsNotNullEngineCustom.java
@@ -1,7 +1,7 @@
-package com.ruoyi.ruleEngine.engine.custom;
+package com.ruoyi.dataAsset.engine.custom;
-import com.ruoyi.ruleEngine.engine.action.ActionDiscard;
-import com.ruoyi.ruleEngine.engine.scope.DataModelEngine;
+import com.ruoyi.dataAsset.engine.action.ActionDiscard;
+import com.ruoyi.dataAsset.engine.scope.DataModelEngine;
/**
* 不为空自定义引擎
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/DataModelEngine.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/DataModelEngine.java
similarity index 75%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/DataModelEngine.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/DataModelEngine.java
index 8974b06..b3ca9f5 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/DataModelEngine.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/DataModelEngine.java
@@ -1,9 +1,9 @@
-package com.ruoyi.ruleEngine.engine.scope;
+package com.ruoyi.dataAsset.engine.scope;
-import com.ruoyi.ruleEngine.engine.Engine;
-import com.ruoyi.ruleEngine.model.DataModel;
-import com.ruoyi.ruleEngine.model.process.DataModelProcessModel;
-import com.ruoyi.ruleEngine.context.DataModelContextHolder;
+import com.ruoyi.dataAsset.engine.Engine;
+import com.ruoyi.dataAsset.model.DataModel;
+import com.ruoyi.dataAsset.model.process.DataModelProcessModel;
+import com.ruoyi.dataAsset.context.DataModelContextHolder;
/**
* 数据模型引擎
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/DataSetEngine.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/DataSetEngine.java
similarity index 62%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/DataSetEngine.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/DataSetEngine.java
index c6256ef..2f9c383 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/DataSetEngine.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/DataSetEngine.java
@@ -1,10 +1,10 @@
-package com.ruoyi.ruleEngine.engine.scope;
+package com.ruoyi.dataAsset.engine.scope;
-import com.ruoyi.ruleEngine.context.DataSetContextHolder;
-import com.ruoyi.ruleEngine.engine.Engine;
-import com.ruoyi.ruleEngine.model.DataSetModel;
-import com.ruoyi.ruleEngine.model.RecordModel;
-import com.ruoyi.ruleEngine.model.process.DataSetProcessModel;
+import com.ruoyi.dataAsset.context.DataSetContextHolder;
+import com.ruoyi.dataAsset.engine.Engine;
+import com.ruoyi.dataAsset.model.DataSetModel;
+import com.ruoyi.dataAsset.model.RecordModel;
+import com.ruoyi.dataAsset.model.process.DataSetProcessModel;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/RecordEngine.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/RecordEngine.java
similarity index 65%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/RecordEngine.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/RecordEngine.java
index eff443a..7a66801 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/engine/scope/RecordEngine.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/engine/scope/RecordEngine.java
@@ -1,10 +1,10 @@
-package com.ruoyi.ruleEngine.engine.scope;
+package com.ruoyi.dataAsset.engine.scope;
-import com.ruoyi.ruleEngine.context.RecordContextHolder;
-import com.ruoyi.ruleEngine.engine.Engine;
-import com.ruoyi.ruleEngine.model.DataModel;
-import com.ruoyi.ruleEngine.model.RecordModel;
-import com.ruoyi.ruleEngine.model.process.RecordProcessModel;
+import com.ruoyi.dataAsset.context.RecordContextHolder;
+import com.ruoyi.dataAsset.engine.Engine;
+import com.ruoyi.dataAsset.model.DataModel;
+import com.ruoyi.dataAsset.model.RecordModel;
+import com.ruoyi.dataAsset.model.process.RecordProcessModel;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/DataModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/DataModel.java
similarity index 94%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/DataModel.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/DataModel.java
index b659e4d..d23c5e8 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/DataModel.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/DataModel.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.model;
+package com.ruoyi.dataAsset.model;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/DataSetModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/DataSetModel.java
similarity index 90%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/DataSetModel.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/DataSetModel.java
index 8d3f14d..203889c 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/DataSetModel.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/DataSetModel.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.model;
+package com.ruoyi.dataAsset.model;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/RecordModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/RecordModel.java
similarity index 90%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/RecordModel.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/RecordModel.java
index dcd472f..dfb67f0 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/RecordModel.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/RecordModel.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.model;
+package com.ruoyi.dataAsset.model;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/DataModelProcessModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/DataModelProcessModel.java
similarity index 71%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/DataModelProcessModel.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/DataModelProcessModel.java
index ad5169d..ab33fd0 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/DataModelProcessModel.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/DataModelProcessModel.java
@@ -1,6 +1,6 @@
-package com.ruoyi.ruleEngine.model.process;
+package com.ruoyi.dataAsset.model.process;
-import com.ruoyi.ruleEngine.model.DataModel;
+import com.ruoyi.dataAsset.model.DataModel;
import lombok.Data;
/**
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/DataSetProcessModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/DataSetProcessModel.java
similarity index 77%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/DataSetProcessModel.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/DataSetProcessModel.java
index a93c3ee..d5b2083 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/DataSetProcessModel.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/DataSetProcessModel.java
@@ -1,6 +1,6 @@
-package com.ruoyi.ruleEngine.model.process;
+package com.ruoyi.dataAsset.model.process;
-import com.ruoyi.ruleEngine.model.DataSetModel;
+import com.ruoyi.dataAsset.model.DataSetModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/RecordProcessModel.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/RecordProcessModel.java
similarity index 74%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/RecordProcessModel.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/RecordProcessModel.java
index 5172a8e..b2babfb 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/model/process/RecordProcessModel.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/model/process/RecordProcessModel.java
@@ -1,6 +1,6 @@
-package com.ruoyi.ruleEngine.model.process;
+package com.ruoyi.dataAsset.model.process;
-import com.ruoyi.ruleEngine.model.RecordModel;
+import com.ruoyi.dataAsset.model.RecordModel;
import lombok.Data;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/util/ScopeContextHolderUtil.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/util/ScopeContextHolderUtil.java
similarity index 86%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/util/ScopeContextHolderUtil.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/util/ScopeContextHolderUtil.java
index e012889..ebe5467 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/util/ScopeContextHolderUtil.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/dataAsset/util/ScopeContextHolderUtil.java
@@ -1,10 +1,10 @@
-package com.ruoyi.ruleEngine.util;
+package com.ruoyi.dataAsset.util;
-import com.ruoyi.ruleEngine.context.DataSetContextHolder;
-import com.ruoyi.ruleEngine.model.DataModel;
-import com.ruoyi.ruleEngine.model.DataSetModel;
-import com.ruoyi.ruleEngine.model.RecordModel;
-import com.ruoyi.ruleEngine.model.process.DataSetProcessModel;
+import com.ruoyi.dataAsset.context.DataSetContextHolder;
+import com.ruoyi.dataAsset.model.DataModel;
+import com.ruoyi.dataAsset.model.DataSetModel;
+import com.ruoyi.dataAsset.model.RecordModel;
+import com.ruoyi.dataAsset.model.process.DataSetProcessModel;
import java.sql.*;
import java.util.ArrayList;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/pom.xml b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/pom.xml
index 0f456ca..a98208b 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/pom.xml
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/pom.xml
@@ -18,5 +18,17 @@
17
UTF-8
-
+
+
+
+ com.muyu
+ ruoyi-rule_engine-common
+ 3.6.3
+
+
+
+ com.muyu
+ muyu-common-security
+
+
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/java/com/ruoyi/dataAsset/remote/RemoteRuleEngineService.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/java/com/ruoyi/dataAsset/remote/RemoteRuleEngineService.java
new file mode 100644
index 0000000..74f523d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/java/com/ruoyi/dataAsset/remote/RemoteRuleEngineService.java
@@ -0,0 +1,33 @@
+package com.ruoyi.dataAsset.remote;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.dataAsset.domain.EngineVersion;
+import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
+import com.ruoyi.dataAsset.remote.factory.RemoteRuleEngineFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * 规则引擎远程调用业务层
+ * @ClassName RemoteRuleEngineService
+ * @Author 森静若林
+ * @Date 2024/5/7 13:54
+ */
+@FeignClient(
+ contextId = "remoteRuleEngineService",
+ value = ServiceNameConstants.RULE_ENGINE_SERVICE,
+ fallbackFactory = RemoteRuleEngineFactory.class,
+ path = "/version"
+)
+public interface RemoteRuleEngineService {
+ /**
+ * 查询引擎规则版本列表
+ */
+ @GetMapping("/list")
+ public Result> list(@RequestParam("engineConfigQueryReq") EngineVersionQueryReq engineConfigQueryReq);
+}
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/java/com/ruoyi/dataAsset/remote/factory/RemoteRuleEngineFactory.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/java/com/ruoyi/dataAsset/remote/factory/RemoteRuleEngineFactory.java
new file mode 100644
index 0000000..ea58d74
--- /dev/null
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/java/com/ruoyi/dataAsset/remote/factory/RemoteRuleEngineFactory.java
@@ -0,0 +1,26 @@
+package com.ruoyi.dataAsset.remote.factory;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.dataAsset.domain.EngineVersion;
+import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
+import com.ruoyi.dataAsset.remote.RemoteRuleEngineService;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import java.util.List;
+
+/**
+ * 规则引擎远程调用熔断器
+ * @ClassName RemoteRuleEngineFactory
+ * @Author 森静若林
+ * @Date 2024/5/7 11:59
+ */
+public class RemoteRuleEngineFactory implements FallbackFactory {
+ @Override
+ public RemoteRuleEngineService create(Throwable cause) {
+ return new RemoteRuleEngineService() {
+ @Override
+ public Result> list(EngineVersionQueryReq engineConfigQueryReq) {
+ return Result.error(cause.getMessage());
+ }
+ };
+ }
+}
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..dc6b0de
--- /dev/null
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.ruoyi.dataAsset.remote.factory.RemoteRuleEngineFactory
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/pom.xml b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/pom.xml
index dea8fad..cd1d5ea 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/pom.xml
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/pom.xml
@@ -119,7 +119,7 @@
org.springframework.boot
spring-boot-maven-plugin
- com.ruoyi.ruleEngine.GtlRuleEngineApplication
+ com.ruoyi.dataAsset.GtlRuleEngineApplication
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/GtlRuleEngineApplication.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/GtlRuleEngineApplication.java
similarity index 95%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/GtlRuleEngineApplication.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/GtlRuleEngineApplication.java
index badcb30..dab94a5 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/GtlRuleEngineApplication.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/GtlRuleEngineApplication.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine;
+package com.ruoyi.dataAsset;
import com.ruoyi.common.security.annotation.EnableCustomConfig;
import com.ruoyi.common.security.annotation.EnableMyFeignClients;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineConfigController.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineConfigController.java
similarity index 89%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineConfigController.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineConfigController.java
index 23b1d00..aed4295 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineConfigController.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineConfigController.java
@@ -1,10 +1,10 @@
-package com.ruoyi.ruleEngine.controller;
+package com.ruoyi.dataAsset.controller;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ruleEngine.domain.resp.EngineConfigScopeResp;
-import com.ruoyi.ruleEngine.service.EngineConfigService;
+import com.ruoyi.dataAsset.domain.resp.EngineConfigScopeResp;
+import com.ruoyi.dataAsset.service.EngineConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineMaintenanceController.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineMaintenanceController.java
similarity index 93%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineMaintenanceController.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineMaintenanceController.java
index 9053fce..83b3ad5 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineMaintenanceController.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineMaintenanceController.java
@@ -1,11 +1,11 @@
-package com.ruoyi.ruleEngine.controller;
+package com.ruoyi.dataAsset.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.ruleEngine.service.EngineMaintenanceService;
+import com.ruoyi.dataAsset.service.EngineMaintenanceService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,10 +21,10 @@ import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ruleEngine.domain.EngineMaintenance;
-import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceQueryReq;
-import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceSaveReq;
-import com.ruoyi.ruleEngine.domain.req.EngineMaintenanceEditReq;
+import com.ruoyi.dataAsset.domain.EngineMaintenance;
+import com.ruoyi.dataAsset.domain.req.EngineMaintenanceQueryReq;
+import com.ruoyi.dataAsset.domain.req.EngineMaintenanceSaveReq;
+import com.ruoyi.dataAsset.domain.req.EngineMaintenanceEditReq;
/**
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineVersionController.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineVersionController.java
similarity index 87%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineVersionController.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineVersionController.java
index 728f92a..431613a 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineVersionController.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/controller/EngineVersionController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.ruleEngine.controller;
+package com.ruoyi.dataAsset.controller;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -6,14 +6,14 @@ import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.ruleEngine.domain.EngineVersion;
-import com.ruoyi.ruleEngine.domain.model.TestData;
-import com.ruoyi.ruleEngine.domain.req.EngineVersionEditReq;
-import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
-import com.ruoyi.ruleEngine.domain.req.EngineVersionSaveReq;
-import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq;
-import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp;
-import com.ruoyi.ruleEngine.service.EngineVersionService;
+import com.ruoyi.dataAsset.domain.EngineVersion;
+import com.ruoyi.dataAsset.domain.model.TestData;
+import com.ruoyi.dataAsset.domain.req.EngineVersionEditReq;
+import com.ruoyi.dataAsset.domain.req.EngineVersionQueryReq;
+import com.ruoyi.dataAsset.domain.req.EngineVersionSaveReq;
+import com.ruoyi.dataAsset.domain.req.VersionClassCreateReq;
+import com.ruoyi.dataAsset.domain.resp.VersionClassCreateResp;
+import com.ruoyi.dataAsset.service.EngineVersionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/mapper/EngineMaintenanceMapper.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/mapper/EngineMaintenanceMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/mapper/EngineMaintenanceMapper.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/mapper/EngineMaintenanceMapper.java
index f6b348a..3d51e98 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/mapper/EngineMaintenanceMapper.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/mapper/EngineMaintenanceMapper.java
@@ -1,7 +1,7 @@
-package com.ruoyi.ruleEngine.mapper;
+package com.ruoyi.dataAsset.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.ruleEngine.domain.EngineMaintenance;
+import com.ruoyi.dataAsset.domain.EngineMaintenance;
/**
* 引擎维护Mapper接口
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/mapper/EngineVersionMapper.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/mapper/EngineVersionMapper.java
similarity index 71%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/mapper/EngineVersionMapper.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/mapper/EngineVersionMapper.java
index 5ca4105..9d796b5 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/mapper/EngineVersionMapper.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/mapper/EngineVersionMapper.java
@@ -1,7 +1,7 @@
-package com.ruoyi.ruleEngine.mapper;
+package com.ruoyi.dataAsset.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.ruleEngine.domain.EngineVersion;
+import com.ruoyi.dataAsset.domain.EngineVersion;
/**
* 引擎规则版本Mapper接口
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineConfigService.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineConfigService.java
similarity index 83%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineConfigService.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineConfigService.java
index edb791b..0cffb02 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineConfigService.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineConfigService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.ruleEngine.service;
+package com.ruoyi.dataAsset.service;
-import com.ruoyi.ruleEngine.domain.resp.EngineConfigScopeResp;
+import com.ruoyi.dataAsset.domain.resp.EngineConfigScopeResp;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineMaintenanceService.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineMaintenanceService.java
similarity index 90%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineMaintenanceService.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineMaintenanceService.java
index e6405f6..6332493 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineMaintenanceService.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineMaintenanceService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.ruleEngine.service;
+package com.ruoyi.dataAsset.service;
import java.util.List;
-import com.ruoyi.ruleEngine.domain.EngineMaintenance;
+import com.ruoyi.dataAsset.domain.EngineMaintenance;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineVersionService.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineVersionService.java
similarity index 75%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineVersionService.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineVersionService.java
index cf73e97..caaf87a 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/EngineVersionService.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/EngineVersionService.java
@@ -1,10 +1,10 @@
-package com.ruoyi.ruleEngine.service;
+package com.ruoyi.dataAsset.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.ruleEngine.domain.EngineVersion;
-import com.ruoyi.ruleEngine.domain.model.TestData;
-import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq;
-import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp;
+import com.ruoyi.dataAsset.domain.EngineVersion;
+import com.ruoyi.dataAsset.domain.model.TestData;
+import com.ruoyi.dataAsset.domain.req.VersionClassCreateReq;
+import com.ruoyi.dataAsset.domain.resp.VersionClassCreateResp;
import java.util.List;
/**
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineConfigServiceImpl.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineConfigServiceImpl.java
similarity index 90%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineConfigServiceImpl.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineConfigServiceImpl.java
index 379aa42..f152389 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineConfigServiceImpl.java
@@ -1,8 +1,8 @@
-package com.ruoyi.ruleEngine.service.impl;
+package com.ruoyi.dataAsset.service.impl;
-import com.ruoyi.ruleEngine.constant.ConfigCodeConstants;
-import com.ruoyi.ruleEngine.domain.resp.EngineConfigScopeResp;
-import com.ruoyi.ruleEngine.service.EngineConfigService;
+import com.ruoyi.dataAsset.constant.ConfigCodeConstants;
+import com.ruoyi.dataAsset.domain.resp.EngineConfigScopeResp;
+import com.ruoyi.dataAsset.service.EngineConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.io.IOException;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineMaintenanceServiceImpl.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineMaintenanceServiceImpl.java
similarity index 91%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineMaintenanceServiceImpl.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineMaintenanceServiceImpl.java
index 22b2258..e837e9c 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineMaintenanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineMaintenanceServiceImpl.java
@@ -1,16 +1,16 @@
-package com.ruoyi.ruleEngine.service.impl;
+package com.ruoyi.dataAsset.service.impl;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.core.utils.ObjUtils;
-import com.ruoyi.ruleEngine.domain.EngineVersion;
-import com.ruoyi.ruleEngine.service.EngineVersionService;
+import com.ruoyi.dataAsset.domain.EngineVersion;
+import com.ruoyi.dataAsset.service.EngineVersionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.ruleEngine.mapper.EngineMaintenanceMapper;
-import com.ruoyi.ruleEngine.domain.EngineMaintenance;
-import com.ruoyi.ruleEngine.service.EngineMaintenanceService;
+import com.ruoyi.dataAsset.mapper.EngineMaintenanceMapper;
+import com.ruoyi.dataAsset.domain.EngineMaintenance;
+import com.ruoyi.dataAsset.service.EngineMaintenanceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.transaction.annotation.Transactional;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineVersionServiceImpl.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineVersionServiceImpl.java
similarity index 85%
rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineVersionServiceImpl.java
rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineVersionServiceImpl.java
index 7797da8..e1a4faa 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/service/impl/EngineVersionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/dataAsset/service/impl/EngineVersionServiceImpl.java
@@ -1,20 +1,20 @@
-package com.ruoyi.ruleEngine.service.impl;
+package com.ruoyi.dataAsset.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.ObjUtils;
-import com.ruoyi.ruleEngine.constant.EngineVersionConstants;
-import com.ruoyi.ruleEngine.constant.RuleOperationConstants;
-import com.ruoyi.ruleEngine.domain.EngineVersion;
-import com.ruoyi.ruleEngine.domain.model.TestData;
-import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq;
-import com.ruoyi.ruleEngine.domain.resp.EngineConfigScopeResp;
-import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp;
-import com.ruoyi.ruleEngine.dynamicLoad.DynamicLoader;
-import com.ruoyi.ruleEngine.mapper.EngineVersionMapper;
-import com.ruoyi.ruleEngine.service.EngineConfigService;
-import com.ruoyi.ruleEngine.service.EngineVersionService;
+import com.ruoyi.dataAsset.constant.EngineVersionConstants;
+import com.ruoyi.dataAsset.constant.RuleOperationConstants;
+import com.ruoyi.dataAsset.domain.EngineVersion;
+import com.ruoyi.dataAsset.domain.model.TestData;
+import com.ruoyi.dataAsset.domain.req.VersionClassCreateReq;
+import com.ruoyi.dataAsset.domain.resp.EngineConfigScopeResp;
+import com.ruoyi.dataAsset.domain.resp.VersionClassCreateResp;
+import com.ruoyi.dataAsset.dynamicLoad.DynamicLoader;
+import com.ruoyi.dataAsset.mapper.EngineVersionMapper;
+import com.ruoyi.dataAsset.service.EngineConfigService;
+import com.ruoyi.dataAsset.service.EngineVersionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/bootstrap.yml
index fb05069..12b3541 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/bootstrap.yml
@@ -27,4 +27,4 @@ spring:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
logging:
level:
- com.ruoyi.ruleEngine.mapper: DEBUG
+ com.ruoyi.dataAsset.mapper: DEBUG
diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/logback.xml
index 88b252e..cd488eb 100644
--- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
-
+