diff --git a/cloud-rule-common/pom.xml b/cloud-rule-common/pom.xml
index 71b5e2a..4e14c05 100644
--- a/cloud-rule-common/pom.xml
+++ b/cloud-rule-common/pom.xml
@@ -34,6 +34,10 @@
aliyun-sdk-oss
3.12.0
+
+ com.muyu
+ cloud-datasources-common
+
org.springframework.boot
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 9ffb016..b108274 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
@@ -1,5 +1,7 @@
package com.muyu.rule.common.engine;
+
+
import com.muyu.common.domain.DataValue;
import com.muyu.common.enums.DataType;
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
new file mode 100644
index 0000000..d3acdf2
--- /dev/null
+++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/map/EngineHashMap.java
@@ -0,0 +1,14 @@
+package com.muyu.rule.common.map;
+
+
+import com.muyu.common.domain.DataValue;
+import com.muyu.rule.common.basic.BasicEngine;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class EngineHashMap {
+ public static Map> engineMap = new ConcurrentHashMap<>();
+ public static Map> engineRowMap = new ConcurrentHashMap<>();
+ public static Map> engineDataSetMap = new ConcurrentHashMap<>();
+}
diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java
deleted file mode 100644
index bf752b3..0000000
--- a/cloud-rule-server/src/main/java/com/muyu/rule/server/Main.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.muyu.rule.server;
-
-import com.muyu.common.domain.DataValue;
-import com.muyu.common.enums.DataType;
-import com.muyu.rule.common.basic.BasicEngine;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @Author:张承志
- * @Package:com.muyu.rule.server
- * @Project:cloud-etl-rule
- * @name:Main
- * @Date:2024/8/29 15:57
- */
-public class Main {
-
- static Map> engineMap = new ConcurrentHashMap<>();
-
- static Map> engineRowMap = new ConcurrentHashMap<>();
-
- static Map> engineDataSetMap = new ConcurrentHashMap<>();
- static {
- try {
- Class> aClass = Class.forName("com.muyu.rule.common.engine.ENGINE_VALUE_VFD1000_V1");
- Class> aClass2 = Class.forName("com.muyu.rule.common.engine.ENGINE_VALUE_VFD1000_V2");
- Class> aClass3 = Class.forName("com.muyu.rule.common.engine.ENGINE_ROW_HANG_R1");
- Class> aClass4 = Class.forName("com.muyu.rule.common.engine.ENGINE_DataSet_asdf_S1");
- try {
- engineMap.put("ENGINE_VALUE_VFD1000_V1", (BasicEngine) aClass.newInstance());
- engineMap.put("ENGINE_VALUE_VFD1000_V2", (BasicEngine) aClass2.newInstance());
- engineRowMap.put("ENGINE_ROW_HANG_R1",(BasicEngine) aClass3.newInstance());
- engineDataSetMap.put("ENGINE_DataSet_asdf_S1",(BasicEngine) aClass4.newInstance());
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- }
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
-
- }
-
- public static void main(String[] args) {
-
-
-// System.out.println("字段规则测试:");
-// DataValue dataValue = DataValue.builder()
-// .type(DataType.valueOf("String"))
-// .label("姓名")
-// .key("name")
-// .value(null)
-// .build();
-//
-// BasicEngine engineValue = engineMap.get("ENGINE_VALUE_VFD1000_V1");
-//
-// engineValue.set(dataValue);
-//
-// engineValue.execution();
-
-
- System.out.println("记录规则测试:");
-
-// System.out.println(string);
- DataValue[] dataValues = new DataValue[]{
- new DataValue("name","姓名",DataType.VARCHAR,"张三"),
- new DataValue("name","姓名",DataType.VARCHAR,"李四"),
- new DataValue("name","姓名",DataType.VARCHAR,"王五"),
- new DataValue("name","姓名",DataType.VARCHAR,"张三")
- };
-
- BasicEngine engineRowHangR1 = engineRowMap.get("ENGINE_ROW_HANG_R1");
-
- engineRowHangR1.set(dataValues);
- engineRowHangR1.execution();
-
-// System.out.println("数据集规则测试:");
-//
-// DataValue[][] dataValuesSet = new DataValue[3][3];
-//
-//
-// BasicEngine engineDataSetAsdfS1 = engineDataSetMap.get("ENGINE_DataSet_asdf_S1");
-//
-// engineDataSetAsdfS1.set(dataValuesSet);
-//
-// engineDataSetAsdfS1.execution();
-
-
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-
-
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 90cad1a..eccc778 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
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import static com.muyu.rule.common.map.EngineHashMap.*;
import static com.muyu.rule.server.constant.SuffixClass.Suffix_CLASS;
import static com.muyu.rule.server.constant.SuffixClass.Suffix_JAVA;
@@ -101,9 +102,7 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl> engineMap = new ConcurrentHashMap<>();
- public static Map> engineRowMap = new ConcurrentHashMap<>();
- public static Map> engineDataSetMap = new ConcurrentHashMap<>();
+
/**
* 服务器的存放java源代码的位置
*/