diff --git a/rec-admin/rec-admin-biz/pom.xml b/rec-admin/rec-admin-biz/pom.xml
index aeda1db31e2692de12a0b42465365f1fa3adf227..3ca4553fda880111981d57e0e0934eda03fb46a3 100644
--- a/rec-admin/rec-admin-biz/pom.xml
+++ b/rec-admin/rec-admin-biz/pom.xml
@@ -27,6 +27,11 @@
rec-spi
${revision}
+
+ cn.icanci.rec
+ rec-engine-script
+ ${revision}
+
org.mapstruct
mapstruct
diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/config/EventConfig.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/config/RecAdminConfig.java
similarity index 67%
rename from rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/config/EventConfig.java
rename to rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/config/RecAdminConfig.java
index 67023c01462b2e98cc4ff44465379bbf20bdd9a3..d2412d9c4a61fa79063d5262537d828967698336 100644
--- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/config/EventConfig.java
+++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/config/RecAdminConfig.java
@@ -1,5 +1,7 @@
package cn.icanci.rec.admin.biz.config;
+import cn.icanci.rec.engine.script.RecScriptEngine;
+import cn.icanci.rec.engine.script.RecScriptEngineManager;
import cn.icanci.rec.spi.event.DefaultEventDispatcher;
import cn.icanci.rec.spi.event.EventDispatcher;
@@ -11,10 +13,10 @@ import org.springframework.context.annotation.Configuration;
/**
* @author icanci
- * @since 1.0 Created in 2022/11/11 18:05
+ * @since 1.0 Created in 2022/11/13 14:06
*/
@Configuration
-public class EventConfig implements ApplicationContextAware {
+public class RecAdminConfig implements ApplicationContextAware {
/**
* Spring 上下文
*/
@@ -30,9 +32,18 @@ public class EventConfig implements ApplicationContextAware {
return new DefaultEventDispatcher();
}
+ /**
+ * 执行引擎
+ *
+ * @return 返回脚本执行引擎
+ */
+ @Bean("recScriptEngine")
+ public RecScriptEngine RecScriptEngine() {
+ return RecScriptEngineManager.getRecScriptEngine();
+ }
+
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
context = applicationContext;
}
-
}
diff --git a/rec-engine/rec-engine-script/src/main/java/cn/icanci/rec/engine/script/RecScriptEngine.java b/rec-engine/rec-engine-script/src/main/java/cn/icanci/rec/engine/script/RecScriptEngine.java
index 9ed9d3dab91ec5b0ea7e1290ab9fb5d44dda4711..00319f63e1d85998b90fec762b2326c6ff7c18b5 100644
--- a/rec-engine/rec-engine-script/src/main/java/cn/icanci/rec/engine/script/RecScriptEngine.java
+++ b/rec-engine/rec-engine-script/src/main/java/cn/icanci/rec/engine/script/RecScriptEngine.java
@@ -12,47 +12,46 @@ import javax.script.Bindings;
* @since 1.0 Created in 2022/11/12 22:12
*/
public interface RecScriptEngine {
-
/**
* 执行脚本
*
* @param scriptType 脚本类型
- * @param bindings 脚本运行时参数
* @param script 脚本内容
* @return 脚本执行返回上下文
*/
- RecScriptEngineContext