diff --git a/README.md b/README.md index c87d680..05ed2fc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 桃夭 -桃夭是套基于`Mediasoup`开发的`WebRTC`音视频信令服务,可以扩展其他智能终端接入。 +桃夭是套基于`Mediasoup`开发的`WebRTC`音视频信令服务,可以非常方便的扩展信令接入更多智能终端。

Java @@ -25,10 +25,6 @@ |taoyao-client-harmony|鸿蒙终端|鸿蒙智能终端接入| |taoyao-signal-server|信令服务|终端信令控制| -## 模式 - -监控模式、直播模式、会议模式、屏幕共享模式 - ## 部署 [部署文档](./docs/Deploy.md) @@ -70,11 +66,4 @@ * 音频:降噪、混音、变声 * 视频:水印、美颜、AI识别 * P2P -* 信令直传 -* 信令服务集群 -* 安全处理:房间 -* 媒体交互式启动 -* 会议调整为房间 -* 内外网/多网卡环境 -* 一个信令服务多个媒体服务 * 反复测试推流拉流、拉人踢人、音频视频控制 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java index b961a83..44449bc 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RestController; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.ClientStatus; -import com.acgist.taoyao.signal.terminal.media.Room; -import com.acgist.taoyao.signal.terminal.media.RoomManager; -import com.acgist.taoyao.signal.terminal.media.RoomStatus; +import com.acgist.taoyao.signal.flute.media.Room; +import com.acgist.taoyao.signal.flute.media.RoomManager; +import com.acgist.taoyao.signal.flute.media.RoomStatus; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/MediaProduceEvent.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/MediaProduceEvent.java index 8ed19e1..6c7b719 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/MediaProduceEvent.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/MediaProduceEvent.java @@ -1,8 +1,8 @@ package com.acgist.taoyao.signal.event; import com.acgist.taoyao.signal.client.Client; -import com.acgist.taoyao.signal.terminal.media.Producer; -import com.acgist.taoyao.signal.terminal.media.Room; +import com.acgist.taoyao.signal.flute.media.Producer; +import com.acgist.taoyao.signal.flute.media.Room; import lombok.Getter; import lombok.Setter; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java index 0386c7f..0d5e613 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java @@ -3,7 +3,7 @@ package com.acgist.taoyao.signal.event; import java.util.Map; import com.acgist.taoyao.boot.model.Message; -import com.acgist.taoyao.signal.terminal.media.Room; +import com.acgist.taoyao.signal.flute.media.Room; import lombok.Getter; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/ClientWrapper.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/ClientWrapper.java similarity index 97% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/ClientWrapper.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/ClientWrapper.java index 1316802..eda9d17 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/ClientWrapper.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/ClientWrapper.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Consumer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Consumer.java similarity index 84% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Consumer.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Consumer.java index a09b677..0982ca6 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Consumer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Consumer.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import com.acgist.taoyao.signal.client.Client; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataConsumer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataConsumer.java new file mode 100644 index 0000000..c07dc05 --- /dev/null +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataConsumer.java @@ -0,0 +1,5 @@ +package com.acgist.taoyao.signal.flute.media; + +public class DataConsumer { + +} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/DataProducer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataProducer.java similarity index 69% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/DataProducer.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataProducer.java index a760f27..e0b5deb 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/DataProducer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataProducer.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import java.util.Map; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Kind.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Kind.java similarity index 92% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Kind.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Kind.java index 503f62d..0552db9 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Kind.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Kind.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import com.acgist.taoyao.boot.model.MessageCodeException; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Producer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Producer.java similarity index 94% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Producer.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Producer.java index c6bbb62..1dadc71 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Producer.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Producer.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import java.util.Map; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Room.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Room.java similarity index 98% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Room.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Room.java index bb2a36c..9714137 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Room.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Room.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import java.io.Closeable; import java.util.List; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/RoomManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomManager.java similarity index 98% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/RoomManager.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomManager.java index ec7af04..490a50c 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/RoomManager.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomManager.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import java.util.List; import java.util.Map; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/RoomStatus.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomStatus.java similarity index 92% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/RoomStatus.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomStatus.java index fbe6484..d5ab879 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/RoomStatus.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomStatus.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Transport.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Transport.java similarity index 96% rename from taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Transport.java rename to taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Transport.java index cbcfba4..861c2f5 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Transport.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Transport.java @@ -1,4 +1,4 @@ -package com.acgist.taoyao.signal.terminal.media; +package com.acgist.taoyao.signal.flute.media; import java.io.Closeable; import java.util.Map; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/package-info.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/package-info.java new file mode 100644 index 0000000..4ed74a8 --- /dev/null +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/package-info.java @@ -0,0 +1,4 @@ +/** + * 不同终端管理 + */ +package com.acgist.taoyao.signal.flute; \ No newline at end of file diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java index 238fac9..cc64680 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java @@ -10,7 +10,7 @@ import com.acgist.taoyao.boot.model.MessageCode; import com.acgist.taoyao.boot.service.IdService; import com.acgist.taoyao.signal.client.ClientManager; import com.acgist.taoyao.signal.event.ApplicationEventAdapter; -import com.acgist.taoyao.signal.terminal.media.RoomManager; +import com.acgist.taoyao.signal.flute.media.RoomManager; import lombok.extern.slf4j.Slf4j; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java index 6698a90..b9baf5b 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java @@ -8,7 +8,7 @@ import com.acgist.taoyao.boot.model.MessageCodeException; import com.acgist.taoyao.boot.utils.MapUtils; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; -import com.acgist.taoyao.signal.terminal.media.Room; +import com.acgist.taoyao.signal.flute.media.Room; /** * 房间信令适配器 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java index 0e1e2a2..ac39413 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java @@ -6,8 +6,8 @@ import com.acgist.taoyao.boot.annotation.Protocol; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; +import com.acgist.taoyao.signal.flute.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.Room; /** * 当前讲话终端信令 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java index 7186eaa..1263a34 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java @@ -14,11 +14,11 @@ import com.acgist.taoyao.boot.utils.MapUtils; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; import com.acgist.taoyao.signal.event.MediaProduceEvent; +import com.acgist.taoyao.signal.flute.media.ClientWrapper; +import com.acgist.taoyao.signal.flute.media.Producer; +import com.acgist.taoyao.signal.flute.media.Room; +import com.acgist.taoyao.signal.flute.media.Transport; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.ClientWrapper; -import com.acgist.taoyao.signal.terminal.media.Producer; -import com.acgist.taoyao.signal.terminal.media.Room; -import com.acgist.taoyao.signal.terminal.media.Transport; /** * 消费媒体信令 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java index abf2d71..d32a964 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java @@ -10,10 +10,10 @@ import com.acgist.taoyao.boot.utils.MapUtils; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; import com.acgist.taoyao.signal.event.MediaProduceEvent; +import com.acgist.taoyao.signal.flute.media.ClientWrapper; +import com.acgist.taoyao.signal.flute.media.Producer; +import com.acgist.taoyao.signal.flute.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.ClientWrapper; -import com.acgist.taoyao.signal.terminal.media.Producer; -import com.acgist.taoyao.signal.terminal.media.Room; import lombok.extern.slf4j.Slf4j; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java index 3de0ab2..8f573b3 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java @@ -7,8 +7,8 @@ import com.acgist.taoyao.boot.annotation.Protocol; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; +import com.acgist.taoyao.signal.flute.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.Room; /** * 媒体生产者评分信令 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java index 6ad668e..e008118 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java @@ -7,8 +7,8 @@ import com.acgist.taoyao.boot.annotation.Protocol; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; +import com.acgist.taoyao.signal.flute.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.Room; /** * 路由RTP能力信令 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java index 4a90704..8bb17d9 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java @@ -9,8 +9,8 @@ import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.boot.utils.MapUtils; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; +import com.acgist.taoyao.signal.flute.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.Room; import lombok.extern.slf4j.Slf4j; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java index e7b8190..c6c8817 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java @@ -14,10 +14,10 @@ import com.acgist.taoyao.boot.utils.MapUtils; import com.acgist.taoyao.boot.utils.NetUtils; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; +import com.acgist.taoyao.signal.flute.media.ClientWrapper; +import com.acgist.taoyao.signal.flute.media.Room; +import com.acgist.taoyao.signal.flute.media.Transport; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.ClientWrapper; -import com.acgist.taoyao.signal.terminal.media.Room; -import com.acgist.taoyao.signal.terminal.media.Transport; import lombok.extern.slf4j.Slf4j; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java index 1a129c6..4b08b49 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java @@ -7,8 +7,8 @@ import com.acgist.taoyao.boot.annotation.Protocol; import com.acgist.taoyao.boot.model.Message; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; +import com.acgist.taoyao.signal.flute.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.Room; /** * 关闭房间信令 diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java index 3e89158..c01af19 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java @@ -13,8 +13,8 @@ import com.acgist.taoyao.boot.utils.MapUtils; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; import com.acgist.taoyao.signal.event.MediaClientRegisterEvent; +import com.acgist.taoyao.signal.flute.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolClientAdapter; -import com.acgist.taoyao.signal.terminal.media.Room; import lombok.extern.slf4j.Slf4j; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java index b2eb6cc..e7686dc 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java @@ -11,9 +11,9 @@ import com.acgist.taoyao.boot.model.MessageCodeException; import com.acgist.taoyao.boot.utils.MapUtils; import com.acgist.taoyao.signal.client.Client; import com.acgist.taoyao.signal.client.ClientType; +import com.acgist.taoyao.signal.flute.media.ClientWrapper; +import com.acgist.taoyao.signal.flute.media.Room; import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter; -import com.acgist.taoyao.signal.terminal.media.ClientWrapper; -import com.acgist.taoyao.signal.terminal.media.Room; import lombok.extern.slf4j.Slf4j; diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/DataConsumer.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/DataConsumer.java deleted file mode 100644 index 3bd4d08..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/DataConsumer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.acgist.taoyao.signal.terminal.media; - -public class DataConsumer { - -} diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/package-info.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/package-info.java deleted file mode 100644 index 1e67879..0000000 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 终端功能代码 - */ -package com.acgist.taoyao.signal.terminal; \ No newline at end of file