From 32760ae14bc1dd5d79d0c8c3ec85135c17f6a27d Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Sun, 11 Jun 2023 09:28:35 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taoyao/signal/protocol/ProtocolControlAdapter.java | 6 ++++++ .../protocol/control/ControlServerRecordProtocol.java | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolControlAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolControlAdapter.java index 3b1a021..fb4c8e0 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolControlAdapter.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolControlAdapter.java @@ -2,6 +2,9 @@ package com.acgist.taoyao.signal.protocol; import java.util.Map; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.task.TaskExecutor; + import com.acgist.taoyao.boot.config.Constant; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.boot.model.MessageCodeException; @@ -16,6 +19,9 @@ import com.acgist.taoyao.signal.client.ClientType; */ public abstract class ProtocolControlAdapter extends ProtocolClientAdapter { + @Autowired + protected TaskExecutor taskExecutor; + protected ProtocolControlAdapter(String name, String signal) { super(name, signal); } diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java index 588e62e..0aa694e 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java @@ -5,7 +5,6 @@ import java.util.Map; import java.util.UUID; import org.springframework.context.ApplicationListener; -import org.springframework.scheduling.annotation.Async; import com.acgist.taoyao.boot.annotation.Description; import com.acgist.taoyao.boot.annotation.Protocol; @@ -60,11 +59,14 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen this.ffmpegProperties = ffmpegProperties; } - @Async +// @Async @Override public void onApplicationEvent(RecorderCloseEvent event) { - final Recorder recorder = event.getRecorder(); - this.stop(recorder.getRoom(), recorder.getClientWrapper()); + // 没有提供接口不能使用注解异步执行 + this.taskExecutor.execute(() -> { + final Recorder recorder = event.getRecorder(); + this.stop(recorder.getRoom(), recorder.getClientWrapper()); + }); } @Override