From df41c28d6cd833d91b1c4d6328e6d64fdd3e6f75 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Sat, 2 Sep 2023 09:13:22 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E6=97=A5=E5=B8=B8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acgist/taoyao/signal/protocol/Protocol.java | 1 + .../taoyao/signal/protocol/ProtocolManager.java | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java index 58177a8..3da6570 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/Protocol.java @@ -14,6 +14,7 @@ import com.acgist.taoyao.signal.event.ApplicationEventAdapter; * client:: 终端信令 * system:: 系统信令 * control:: 控制信令 + * session:: 会话信令 * platform:: 平台信令 * * @author acgist diff --git a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java index a00cded..00b48fc 100644 --- a/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java +++ b/taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolManager.java @@ -58,10 +58,10 @@ public class ProtocolManager { this.applicationContext.getBeansOfType(Protocol.class).entrySet().stream() .sorted((a, z) -> a.getValue().signal().compareTo(z.getValue().signal())) .forEach(e -> { - final String key = e.getKey(); - final Protocol value = e.getValue(); - final String name = value.name(); - final String signal = value.signal(); + final String key = e.getKey(); + final Protocol value = e.getValue(); + final String name = value.name(); + final String signal = value.signal(); if(this.protocolMapping.containsKey(signal)) { throw MessageCodeException.of("存在重复信令协议:" + signal); } @@ -91,7 +91,7 @@ public class ProtocolManager { public void execute(String content, AutoCloseable instance) { final Client client = this.clientManager.getClients(instance); if(client == null) { - log.warn("信令终端无效:{}-{}", instance, content); + log.warn("信令终端无效:{} - {}", instance, content); return; } // 验证请求 @@ -107,8 +107,8 @@ public class ProtocolManager { client.push(this.platformErrorProtocol.build(MessageCode.CODE_1002, "信令消息格式错误(没有头部)")); return; } - final String v = header.getV(); - final Long id = header.getId(); + final String v = header.getV(); + final Long id = header.getId(); final String signal = header.getSignal(); // 设置缓存ID this.platformErrorProtocol.set(id);