From 835fcd1e72f39ecd838a30881ae5a8d5583cae2d Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Mon, 9 Sep 2024 21:58:06 +0800
Subject: [PATCH] 1
---
cloud-rule-common/pom.xml | 5 +
.../abstracts/DataEngineDataSetActuator.java | 3 +-
.../abstracts/DataEngineRowActuator.java | 2 +-
.../abstracts/DataEngineValueActuator.java | 3 +-
.../handler/DataEngineDataSetHandler.java | 2 +-
.../basic/handler/DataEngineRowHandler.java | 2 +-
.../basic/handler/DataEngineValueHandler.java | 2 +-
.../common/engine/ENGINE_DataSet_asdf_S1.java | 2 +-
.../engine/ENGINE_DataSet_ytrrt_S2.java | 2 +-
.../common/engine/ENGINE_ROW_HANG_R1.java | 2 +-
.../engine/ENGINE_VALUE_VFD1000_V1.java | 2 +-
.../engine/ENGINE_VALUE_VFD1000_V2.java | 5 +-
.../engine/ENGINE_VALUE_VFD1000_V3.java | 2 +-
.../muyu/rule/common/map/EngineHashMap.java | 2 +-
.../rule/common/utils/LoadEngineClass.java | 2 +-
.../rule/common/utils/LoadEngineClassTwo.java | 190 ++++++++++++++++++
cloud-rule-server/pom.xml | 6 +-
.../rule/server/OSSClassLoaderExample.java | 5 +-
.../RuleEngineVersionController.java | 7 +-
.../service/RuleEngineVersionService.java | 2 +-
.../impl/RuleEngineVersionServiceImpl.java | 2 +-
21 files changed, 227 insertions(+), 23 deletions(-)
create mode 100644 cloud-rule-common/src/main/java/com/muyu/rule/common/utils/LoadEngineClassTwo.java
diff --git a/cloud-rule-common/pom.xml b/cloud-rule-common/pom.xml
index 4e14c05..b049433 100644
--- a/cloud-rule-common/pom.xml
+++ b/cloud-rule-common/pom.xml
@@ -39,6 +39,11 @@
cloud-datasources-common
+
+ com.muyu
+ cloud-common-etl
+ 1.0.0
+
org.springframework.boot
spring-boot-devtools
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java
index eb01724..0470a88 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineDataSetActuator.java
@@ -1,6 +1,7 @@
package com.muyu.rule.common.basic.abstracts;
-import com.muyu.common.domain.DataValue;
+
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.BasicEngine;
import com.muyu.rule.common.basic.handler.DataEngineDataSetHandler;
import com.muyu.rule.common.basic.handler.DataEngineHandler;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java
index 0fd2672..1d8bb01 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineRowActuator.java
@@ -1,6 +1,6 @@
package com.muyu.rule.common.basic.abstracts;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.BasicEngine;
import com.muyu.rule.common.basic.handler.DataEngineRowHandler;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java
index 4c27b43..d47b866 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/abstracts/DataEngineValueActuator.java
@@ -1,6 +1,7 @@
package com.muyu.rule.common.basic.abstracts;
-import com.muyu.common.domain.DataValue;
+
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.BasicEngine;
import com.muyu.rule.common.basic.handler.DataEngineValueHandler;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java
index 5014718..c619cf2 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineDataSetHandler.java
@@ -1,6 +1,6 @@
package com.muyu.rule.common.basic.handler;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
/**
* @Author:张承志
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java
index 4091e2b..945586d 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineRowHandler.java
@@ -1,6 +1,6 @@
package com.muyu.rule.common.basic.handler;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
/**
* @Author:张承志
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java
index c84b9cd..0818e8f 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/basic/handler/DataEngineValueHandler.java
@@ -1,7 +1,7 @@
package com.muyu.rule.common.basic.handler;
import com.muyu.common.core.text.Convert;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
/**
* @Author:张承志
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.java
index f65afa5..79b38d2 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_asdf_S1.java
@@ -1,6 +1,6 @@
package com.muyu.rule.common.engine;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.abstracts.DataEngineDataSetActuator;
import com.muyu.rule.common.exception.DeliteException;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_ytrrt_S2.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_ytrrt_S2.java
index c0b021e..29bd0ac 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_ytrrt_S2.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_DataSet_ytrrt_S2.java
@@ -3,7 +3,7 @@ package com.muyu.rule.common.engine;
import cn.hutool.core.util.DesensitizedUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.abstracts.DataEngineDataSetActuator;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.java
index 52de8dd..63b6287 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_ROW_HANG_R1.java
@@ -1,6 +1,6 @@
package com.muyu.rule.common.engine;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.abstracts.DataEngineRowActuator;
import java.util.Arrays;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.java
index bccc9aa..c010318 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V1.java
@@ -1,6 +1,6 @@
package com.muyu.rule.common.engine;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator;
import com.muyu.rule.common.exception.DeliteException;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.java
index b108274..9d9f609 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V2.java
@@ -2,8 +2,9 @@ package com.muyu.rule.common.engine;
-import com.muyu.common.domain.DataValue;
-import com.muyu.common.enums.DataType;
+import com.muyu.etl.domain.DataValue;
+
+import com.muyu.etl.enums.DataType;
import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator;
import java.time.LocalDateTime;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.java
index 6cb10bc..f1122e9 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/engine/ENGINE_VALUE_VFD1000_V3.java
@@ -1,6 +1,6 @@
package com.muyu.rule.common.engine;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.abstracts.DataEngineValueActuator;
/**
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/map/EngineHashMap.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/map/EngineHashMap.java
index c269f74..3617f0d 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/map/EngineHashMap.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/map/EngineHashMap.java
@@ -1,7 +1,7 @@
package com.muyu.rule.common.map;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.BasicEngine;
import java.util.Map;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/LoadEngineClass.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/LoadEngineClass.java
index 1ea368f..07619ea 100644
--- a/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/LoadEngineClass.java
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/LoadEngineClass.java
@@ -1,6 +1,6 @@
package com.muyu.rule.common.utils;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.BasicEngine;
import com.muyu.rule.common.load.ExternalClassLoader;
import lombok.extern.log4j.Log4j2;
diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/LoadEngineClassTwo.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/LoadEngineClassTwo.java
new file mode 100644
index 0000000..eaa7228
--- /dev/null
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/LoadEngineClassTwo.java
@@ -0,0 +1,190 @@
+package com.muyu.rule.common.utils;
+
+import com.muyu.etl.domain.DataValue;
+import com.muyu.rule.common.basic.BasicEngine;
+import com.muyu.rule.common.load.ExternalClassLoader;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static com.muyu.rule.common.constant.SuffixClass.Suffix_CLASS;
+
+
+@Log4j2
+@Component
+public class LoadEngineClassTwo {
+ public static Map> engineMap = new ConcurrentHashMap<>();
+ public static Map> engineRowMap = new ConcurrentHashMap<>();
+ public static Map> engineDataSetMap = new ConcurrentHashMap<>();
+ /**
+ * 服务器的存放java源代码的位置
+ */
+ public static final String engineWorkSourcePath = "/home/source/";
+
+
+ /**
+ * 引擎加载需要引入类和包文件的位置
+ */
+ public static final String importClassAndPackPath = "home/lib/";
+
+ /**
+ * 规则引擎的包的路径
+ */
+ public static final String className_prefix = "com.muyu.rule.common.engine.";
+
+ /**
+ * 服务器存放引擎的class文件的位置
+ *
+ * @param className 类名
+ * @param versionClazz 源代码
+ */
+
+ public static final String serverClassPath = "com/muyu/rule/common/engine/";
+ public void loadValueEngineClass(String className) {
+ for (String s : engineMap.keySet()) {
+ log.info("======"+s);
+ }
+ //查询类是否已加载,避免重复加载规则引擎
+ if (!engineMap.containsKey(className)) {
+ log.info("引擎map集合下没有该实例的规则,进行自定义类加载");
+ try {
+ // 假设这是你的外部类文件路径
+ String externalClassFilePath =
+ importClassAndPackPath + serverClassPath + className +Suffix_CLASS;
+ Path classFilePath = Paths.get(externalClassFilePath);
+ String externalClassDir = externalClassFilePath.substring(0, externalClassFilePath.lastIndexOf('/'));
+ URL[] urls = new URL[]{new File(externalClassDir).toURI().toURL()};
+
+ //创建自定义类加载器
+ ExternalClassLoader externalClassLoader = new ExternalClassLoader(urls);
+ //加载类
+ //注意类名必须是完全限定名(包括包名)
+ Class> clazz = null;
+ clazz = externalClassLoader.loadClassFromPath(classFilePath, className_prefix + className);
+ //创建类的实例
+ Object instance = clazz.getDeclaredConstructor().newInstance();
+ //将加载出来引擎实例存入map集合中
+
+ engineMap.put(className,(BasicEngine) instance);
+
+ } catch (IOException | InvocationTargetException | InstantiationException | IllegalAccessException |
+ NoSuchMethodException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ public void loadRowEngineClass(String className) {
+
+ //查询类是否已加载,避免重复加载规则引擎
+ if (!engineRowMap.containsKey(className)) {
+ log.info("引擎map集合下没有该实例的规则,进行自定义类加载");
+ try {
+ // 假设这是你的外部类文件路径
+ String externalClassFilePath =
+ importClassAndPackPath + serverClassPath + className + Suffix_CLASS;
+ Path classFilePath = Paths.get(externalClassFilePath);
+ String externalClassDir = externalClassFilePath.substring(0, externalClassFilePath.lastIndexOf('/'));
+ URL[] urls = new URL[]{new File(externalClassDir).toURI().toURL()};
+
+ //创建自定义类加载器
+ ExternalClassLoader externalClassLoader = new ExternalClassLoader(urls);
+
+ //加载类
+ //注意类名必须是完全限定名(包括包名)
+ Class> clazz = null;
+
+ clazz = externalClassLoader.loadClassFromPath(classFilePath, className_prefix + className);
+ //创建类的实例
+ Object instance = clazz.getDeclaredConstructor().newInstance();
+ //将加载出来引擎实例存入map集合中
+
+ engineRowMap.put(className,(BasicEngine) instance);
+
+ } catch (IOException | InvocationTargetException | InstantiationException | IllegalAccessException |
+ NoSuchMethodException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ public void loadDataSetEngineClass(String className) {
+
+ //查询类是否已加载,避免重复加载规则引擎
+ if (!engineDataSetMap.containsKey(className)) {
+ log.info("引擎map集合下没有该实例的规则,进行自定义类加载");
+ try {
+ // 设置外部类文件路径
+ String externalClassFilePath =
+ importClassAndPackPath + serverClassPath + className + Suffix_CLASS;
+ Path classFilePath = Paths.get(externalClassFilePath);
+ String externalClassDir = externalClassFilePath.substring(0, externalClassFilePath.lastIndexOf('/'));
+ URL[] urls = new URL[]{new File(externalClassDir).toURI().toURL()};
+
+ //创建自定义类加载器
+ ExternalClassLoader externalClassLoader = new ExternalClassLoader(urls);
+
+ //加载类
+ //注意类名必须是完全限定名(包括包名)
+ Class> clazz = null;
+
+ clazz = externalClassLoader.loadClassFromPath(classFilePath, className_prefix + className);
+ //创建类的实例
+ Object instance = clazz.getDeclaredConstructor().newInstance();
+ //将加载出来引擎实例存入map集合中
+
+ engineDataSetMap.put(className,(BasicEngine) instance);
+
+ } catch (IOException | InvocationTargetException | InstantiationException | IllegalAccessException |
+ NoSuchMethodException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ }
+
+ public DataValue testEngine(String className, DataValue dataValue) {
+ log.info("测试的数据[]{}:" + dataValue);
+ loadValueEngineClass(className);
+ BasicEngine valueBasicEngine = engineMap.get(className);
+
+ valueBasicEngine.set(dataValue);
+
+ valueBasicEngine.execution();
+ DataValue value = valueBasicEngine.get();
+ return value;
+ }
+
+ public DataValue[] testEngine(String className, DataValue[] dataValue) {
+ log.info("测试的数据[]{}:" + dataValue);
+ loadRowEngineClass(className);
+ BasicEngine basicEngine = engineRowMap.get(className);
+
+ basicEngine.set(dataValue);
+
+ basicEngine.execution();
+ DataValue[] dataValues = basicEngine.get();
+ return dataValues;
+ }
+
+
+ public DataValue[][] testEngine(String className, DataValue[][] dataValues) {
+ loadDataSetEngineClass(className);
+ BasicEngine basicEngine = engineDataSetMap.get(className);
+
+ basicEngine.set(dataValues);
+
+ basicEngine.execution();
+
+ DataValue[][] dataValues1 = basicEngine.get();
+
+ return dataValues1;
+ }
+}
+
diff --git a/cloud-rule-server/pom.xml b/cloud-rule-server/pom.xml
index eb7ab39..d4106f8 100644
--- a/cloud-rule-server/pom.xml
+++ b/cloud-rule-server/pom.xml
@@ -97,7 +97,11 @@
spring-boot-devtools
true
-
+
+ com.muyu
+ cloud-common-etl
+ 1.0.0
+
diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java
index 72c0ad8..1d199c8 100644
--- a/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java
+++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/OSSClassLoaderExample.java
@@ -1,7 +1,8 @@
package com.muyu.rule.server;
-import com.muyu.common.domain.DataValue;
-import com.muyu.common.enums.DataType;
+import com.muyu.etl.domain.DataValue;
+
+import com.muyu.etl.enums.DataType;
import com.muyu.rule.common.utils.OssUtil;
import com.muyu.rule.common.basic.BasicEngine;
import com.muyu.rule.server.complie.SourceCodeComplier;
diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java
index 7bad485..36bc8fa 100644
--- a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java
+++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java
@@ -2,7 +2,8 @@ package com.muyu.rule.server.controller;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.muyu.common.core.domain.Result;
-import com.muyu.common.domain.DataValue;
+
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.domain.RuleEngineVersion;
import com.muyu.rule.common.domain.req.VersionAddReq;
import com.muyu.rule.common.utils.LoadEngineClass;
@@ -131,7 +132,7 @@ public class RuleEngineVersionController {
"import cn.hutool.core.util.DesensitizedUtil;\n" +
"import com.alibaba.fastjson2.JSON;\n" +
"import com.alibaba.fastjson2.JSONObject;\n" +
- "import com.muyu.common.domain.DataValue;\n" +
+ "import com.muyu.etl.domain.DataValue;\n" +
"import com.muyu.rule.common.basic.abstracts." + parentClass + ";\n" +
"\n" +
"\n" +
@@ -226,7 +227,7 @@ public class RuleEngineVersionController {
// "import cn.hutool.core.util.DesensitizedUtil;\n" +
// "import com.alibaba.fastjson2.JSON;\n" +
// "import com.alibaba.fastjson2.JSONObject;\n" +
-// "import com.muyu.common.domain.DataValue;\n" +
+// "import com.muyu.etl.domain.DataValue;\n" +
// "import com.muyu.rule.common.basic.abstracts.${parentClass};\n" +
// "\n" +
// "\n" +
diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java
index 99ef6c7..5ca3e6e 100644
--- a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java
+++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/RuleEngineVersionService.java
@@ -1,7 +1,7 @@
package com.muyu.rule.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.domain.RuleEngineVersion;
import java.util.List;
diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java
index 79f5c64..ba72c7c 100644
--- a/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java
+++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/service/impl/RuleEngineVersionServiceImpl.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.enums.SystemYesNo;
-import com.muyu.common.domain.DataValue;
+import com.muyu.etl.domain.DataValue;
import com.muyu.rule.common.basic.BasicEngine;
import com.muyu.rule.common.domain.RuleEngineVersion;
import com.muyu.rule.common.load.ExternalClassLoader;