|
|
@@ -159,7 +159,7 @@ public class WebsockServer extends PublishServer {
|
|
|
if (streamId == null || streamId.isEmpty() || data == null || data.length == 0) {
|
|
|
return;
|
|
|
}
|
|
|
- ChannelGroup g = streamGroups.get(new CommUtils.InfoItem(streamId, prefix));
|
|
|
+ ChannelGroup g = streamGroups.get(CommUtils.InfoItem.of(streamId, prefix));
|
|
|
if (g != null && !g.isEmpty()) {
|
|
|
g.writeAndFlush(new BinaryWebSocketFrame(Unpooled.wrappedBuffer(data)));
|
|
|
}
|
|
|
@@ -173,8 +173,8 @@ public class WebsockServer extends PublishServer {
|
|
|
if (streamId == null || streamId.isEmpty() || channelId == null || channelId.isEmpty()) {
|
|
|
return;
|
|
|
}
|
|
|
- streamIdToChannelId.put(new CommUtils.InfoItem(streamId, prefix), channelId);
|
|
|
- channelIdToStreamId.put(channelId, new CommUtils.InfoItem(streamId, prefix));
|
|
|
+ streamIdToChannelId.put(CommUtils.InfoItem.of(streamId, prefix), channelId);
|
|
|
+ channelIdToStreamId.put(channelId, CommUtils.InfoItem.of(streamId, prefix));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -202,7 +202,7 @@ public class WebsockServer extends PublishServer {
|
|
|
* 获取streamId对应的channelId方法
|
|
|
*/
|
|
|
public String getChannelIdByStreamId(String streamId, String prefix) {
|
|
|
- return streamIdToChannelId.get(new CommUtils.InfoItem(streamId, prefix));
|
|
|
+ return streamIdToChannelId.get(CommUtils.InfoItem.of(streamId, prefix));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -279,7 +279,7 @@ public class WebsockServer extends PublishServer {
|
|
|
if (streamId == null || streamId.isEmpty() || ch == null) {
|
|
|
return;
|
|
|
}
|
|
|
- CommUtils.InfoItem infoItem = new CommUtils.InfoItem(streamId, relay.getPrefix());
|
|
|
+ CommUtils.InfoItem infoItem = CommUtils.InfoItem.of(streamId, relay.getPrefix());
|
|
|
// 将channel加入对应的ChannelGroup
|
|
|
ChannelGroup group = streamGroups.computeIfAbsent(infoItem,
|
|
|
k -> new DefaultChannelGroup(workerGroup.next()));
|