From b1c7bf2601780a46f5caaca55d00f535d9fc9b81 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Sun, 20 Nov 2022 09:29:23 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E9=85=8D=E7=BD=AE=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SignalAutoConfiguration.java | 25 +++++++++++++++++++ .../listener/platform/ScriptListener.java | 2 -- .../protocol/platform/ScriptProtocol.java | 3 --- .../protocol/platform/ShutdownProtocol.java | 2 -- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/config/SignalAutoConfiguration.java b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/config/SignalAutoConfiguration.java index cf9b19a..d1f41f3 100644 --- a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/config/SignalAutoConfiguration.java +++ b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/config/SignalAutoConfiguration.java @@ -1,12 +1,16 @@ package com.acgist.taoyao.signal.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.server.standard.ServerEndpointExporter; import com.acgist.taoyao.signal.client.websocket.WebSocketSignal; +import com.acgist.taoyao.signal.listener.platform.ScriptListener; +import com.acgist.taoyao.signal.protocol.platform.ScriptProtocol; +import com.acgist.taoyao.signal.protocol.platform.ShutdownProtocol; /** * 信令配置 @@ -29,4 +33,25 @@ public class SignalAutoConfiguration { return new ServerEndpointExporter(); } + @Bean + @ConditionalOnProperty(prefix = "taoyao.signal.platform.script", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnMissingBean + public ScriptProtocol scriptProtocol() { + return new ScriptProtocol(); + } + + @Bean + @ConditionalOnProperty(prefix = "taoyao.signal.platform.script", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnMissingBean + public ScriptListener scriptListener() { + return new ScriptListener(); + } + + @Bean + @ConditionalOnProperty(prefix = "taoyao.signal.platform.shutdown", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnMissingBean + public ShutdownProtocol shutdownProtocol() { + return new ShutdownProtocol(); + } + } diff --git a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/platform/ScriptListener.java b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/platform/ScriptListener.java index d06eab7..5259161 100644 --- a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/platform/ScriptListener.java +++ b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/listener/platform/ScriptListener.java @@ -5,7 +5,6 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.ClientSession; @@ -20,7 +19,6 @@ import lombok.extern.slf4j.Slf4j; * @author acgist */ @Slf4j -@Component public class ScriptListener extends ApplicationListenerAdapter { @Async diff --git a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/ScriptProtocol.java b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/ScriptProtocol.java index bcd3fa8..2d8d9cc 100644 --- a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/ScriptProtocol.java +++ b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/ScriptProtocol.java @@ -2,8 +2,6 @@ package com.acgist.taoyao.signal.protocol.platform; import java.util.Map; -import org.springframework.stereotype.Component; - import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.ClientSession; import com.acgist.taoyao.signal.event.platform.ScriptEvent; @@ -14,7 +12,6 @@ import com.acgist.taoyao.signal.protocol.ProtocolMapAdapter; * * @author acgist */ -@Component public class ScriptProtocol extends ProtocolMapAdapter { public static final Integer PID = 1001; diff --git a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/ShutdownProtocol.java b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/ShutdownProtocol.java index 0814aec..79165e1 100644 --- a/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/ShutdownProtocol.java +++ b/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/platform/ShutdownProtocol.java @@ -1,7 +1,6 @@ package com.acgist.taoyao.signal.protocol.platform; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.stereotype.Component; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.ClientSession; @@ -15,7 +14,6 @@ import lombok.extern.slf4j.Slf4j; * @author acgist */ @Slf4j -@Component public class ShutdownProtocol extends ProtocolAdapter { public static final Integer PID = 1000;