diff --git a/backend/app/src/main/java/io/metersphere/listener/AppStartListener.java b/backend/app/src/main/java/io/metersphere/listener/AppStartListener.java index cba8f0a7e0..376add4f23 100644 --- a/backend/app/src/main/java/io/metersphere/listener/AppStartListener.java +++ b/backend/app/src/main/java/io/metersphere/listener/AppStartListener.java @@ -1,14 +1,11 @@ package io.metersphere.listener; -import io.metersphere.api.event.ApiEventSource; import io.metersphere.functional.domain.ExportTask; import io.metersphere.functional.domain.ExportTaskExample; import io.metersphere.functional.mapper.ExportTaskMapper; -import io.metersphere.plan.listener.ExecEventListener; import io.metersphere.sdk.constants.StorageType; import io.metersphere.sdk.file.FileCenter; import io.metersphere.sdk.file.MinioRepository; -import io.metersphere.sdk.util.CommonBeanFactory; import io.metersphere.sdk.util.LogUtils; import io.metersphere.system.constants.ExportConstants; import io.metersphere.system.service.BaseScheduleService; @@ -53,21 +50,6 @@ public class AppStartListener implements ApplicationRunner { ExportTask exportTask = new ExportTask(); exportTask.setState(ExportConstants.ExportState.STOP.name()); exportTaskMapper.updateByExampleSelective(exportTask, exportTaskExample); - - // 注册所有监听源 - LogUtils.info("初始化接口事件源"); - ApiEventSource apiEventSource = CommonBeanFactory.getBean(ApiEventSource.class); - LogUtils.info("初始化用例管理事件源"); - //todo: 注册其他事件源 - - // 创建监听器对象并注册到多个事件源 - ExecEventListener listener = CommonBeanFactory.getBean(ExecEventListener.class); - apiEventSource.addListener(listener); - - //todo: 注册其他监听器 - - // 触发事件 - apiEventSource.fireEvent("API", "Event after removing the listener test."); // 加载插件 pluginLoadService.loadPlugins(); } diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/Event.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/Event.java deleted file mode 100644 index 924ca9bb0f..0000000000 --- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/Event.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.metersphere.sdk.listener; - -import lombok.Data; - -import java.util.Map; - -@Data -public class Event { - private String module; - private String message; - private Map paramMap; - - public Event(String module, String message) { - this.module = module; - this.message = message; - } - - public Event(String module, String message, Map paramMap) { - this.module = module; - this.message = message; - this.paramMap = paramMap; - } - - - public String module() { - return this.module; - } - - public String message() { - return this.message; - } - - public Map paramMap() { - return this.paramMap; - } -} diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/EventListener.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/EventListener.java deleted file mode 100644 index ee25ed34dc..0000000000 --- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/EventListener.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.metersphere.sdk.listener; - -/** - * 监听所有执行结果 - * - * @param - */ -public interface EventListener { - void onEvent(T event); -} \ No newline at end of file diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/EventSource.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/EventSource.java deleted file mode 100644 index ba157e064c..0000000000 --- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/listener/EventSource.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.metersphere.sdk.listener; - -import java.util.Map; - -public interface EventSource { - /** - * 注册监听 - */ - void addListener(EventListener listener); - - /** - * 触发事件 - */ - void fireEvent(String module, String message); - - /** - * 触发事件,带有参数 - */ - void fireEvent(String module, String message, Map paramMap); -} diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/event/ApiEventSource.java b/backend/services/api-test/src/main/java/io/metersphere/api/event/ApiEventSource.java deleted file mode 100644 index 5da0649518..0000000000 --- a/backend/services/api-test/src/main/java/io/metersphere/api/event/ApiEventSource.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.metersphere.api.event; - -import io.metersphere.sdk.listener.Event; -import io.metersphere.sdk.listener.EventListener; -import io.metersphere.sdk.listener.EventSource; -import io.metersphere.sdk.util.LogUtils; -import org.springframework.stereotype.Component; - -import java.util.Map; - -@Component -public class ApiEventSource implements EventSource { - private EventListener listener; - - @Override - public void addListener(EventListener listener) { - this.listener = listener; - } - - @Override - public void fireEvent(String module, String message) { - Event event = new Event("API", message); - listener.onEvent(event); - } - - @Override - public void fireEvent(String module, String message, Map paramMap) { - Event event = new Event("API", message, paramMap); - listener.onEvent(event); - LogUtils.info("带有参数的监听事件"); - } - -} diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/EventSourceTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/EventSourceTests.java deleted file mode 100644 index dc14ddf855..0000000000 --- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/EventSourceTests.java +++ /dev/null @@ -1,41 +0,0 @@ -package io.metersphere.api.controller; - -import io.metersphere.api.event.ApiEventSource; -import io.metersphere.sdk.listener.Event; -import io.metersphere.sdk.listener.EventListener; -import io.metersphere.sdk.util.CommonBeanFactory; -import io.metersphere.sdk.util.LogUtils; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.HashMap; - - -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@TestMethodOrder(MethodOrderer.OrderAnnotation.class) -@AutoConfigureMockMvc -public class EventSourceTests { - - @Test - @Order(0) - public void eventSourceTest() throws Exception { - // 注册所有监听源 - LogUtils.info("初始化接口事件源"); - ApiEventSource apiEventSource = CommonBeanFactory.getBean(ApiEventSource.class); - assert apiEventSource != null; - apiEventSource.addListener(new EventListener() { - @Override - public void onEvent(Event event) { - LogUtils.info("ExecEventListener: " + event.module() + ":" + event.message()); - } - }); - // 触发事件 - apiEventSource.fireEvent("API", "Event after removing the listener test."); - // 触发事件待参数 - apiEventSource.fireEvent("API", "Event after removing the listener test.",new HashMap<>()); - } -} diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/listener/ExecEventListener.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/listener/ExecEventListener.java deleted file mode 100644 index 6d9cdb1109..0000000000 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/listener/ExecEventListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.metersphere.plan.listener; - -import io.metersphere.sdk.listener.Event; -import io.metersphere.sdk.listener.EventListener; -import io.metersphere.sdk.util.LogUtils; -import org.springframework.stereotype.Component; - -@Component -public class ExecEventListener implements EventListener { - @Override - public void onEvent(Event event) { - // todo: 测试计划事件处理逻辑 - LogUtils.info("ExecEventListener: " + event.module() + ":" + event.message()); - } -} diff --git a/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/EventListenerTests.java b/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/EventListenerTests.java deleted file mode 100644 index dad5bc0a8c..0000000000 --- a/backend/services/test-plan/src/test/java/io/metersphere/plan/controller/EventListenerTests.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.metersphere.plan.controller; - -import io.metersphere.plan.listener.ExecEventListener; -import io.metersphere.sdk.listener.Event; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; - - -@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@TestMethodOrder(MethodOrderer.OrderAnnotation.class) -@AutoConfigureMockMvc -public class EventListenerTests { - - @Test - @Order(0) - public void eventSourceTest() throws Exception { - new ExecEventListener().onEvent(new Event("TEST", "Event after removing the listener test.")); - } -}