diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index 0ed2d293c..91194c61b 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml @@ -39,11 +39,6 @@ lombok - - org.dromara - ruoyi-common-core - - diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/event/NotifierEvent.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/event/NotifierEvent.java deleted file mode 100644 index 7df53e460..000000000 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/event/NotifierEvent.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.dromara.monitor.admin.event; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 通知事件 - * - * @author AprilWind - */ -@Data -public class NotifierEvent implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 实例注册名称 - */ - private String registName; - - /** - * 实例状态名称 - */ - private String statusName; - - /** - * 实例ID - */ - private String instanceId; - - /** - * 实例状态 - */ - private String status; - - /** - * 服务URL - */ - private String serviceUrl; - -} diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java index e2b529449..838eefc47 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java @@ -6,8 +6,6 @@ import de.codecentric.boot.admin.server.domain.events.InstanceEvent; import de.codecentric.boot.admin.server.domain.events.InstanceStatusChangedEvent; import de.codecentric.boot.admin.server.notify.AbstractEventNotifier; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.monitor.admin.event.NotifierEvent; import org.springframework.stereotype.Component; import reactor.core.publisher.Mono; @@ -51,13 +49,6 @@ public class CustomNotifier extends AbstractEventNotifier { }; log.info("Instance Status Change: 状态名称【{}】, 注册名称【{}】, 实例ID【{}】, 状态【{}】, 服务URL【{}】", statusName, registName, instanceId, status, serviceUrl); - NotifierEvent notifier = new NotifierEvent(); - notifier.setRegistName(registName); - notifier.setStatusName(statusName); - notifier.setInstanceId(instanceId); - notifier.setStatus(status); - notifier.setServiceUrl(serviceUrl); - SpringUtils.context().publishEvent(notifier); } }); } diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/InfoNotifier.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/InfoNotifier.java deleted file mode 100644 index 455883e38..000000000 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/InfoNotifier.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.dromara.monitor.admin.notifier; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.monitor.admin.event.NotifierEvent; -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -/** - * 信息通知 - * - * @author AprilWind - */ -@RequiredArgsConstructor -@Slf4j -@Service -public class InfoNotifier { - - /** - * 异步处理通知事件的方法 - *

- * 该方法会处理 `NotifierEvent` 事件,执行通知相关的操作,如发送邮件或短信 - * - * @param notifier 事件对象,包含了需要通知的详细信息,包括注册名称、状态名称、实例 ID、状态和服务 URL - */ - @Async - @EventListener - public void infoNotification(NotifierEvent notifier) { - // 在这里添加处理通知事件的逻辑 - // 例如,依据 notifier 对象的信息发送邮件或短信通知 - } - -}