diff --git a/net/src/test/resources/protocol.xml b/net/src/test/resources/protocol.xml index deb3a62a..6a131873 100644 --- a/net/src/test/resources/protocol.xml +++ b/net/src/test/resources/protocol.xml @@ -1,9 +1,9 @@ - + - + @@ -20,7 +20,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -80,13 +80,13 @@ - + - + diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java index 497b813f..0a3790a6 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -206,9 +206,8 @@ public class ProtocolAnalysis { for (Class clazz : packetClazzList) { var protocolId = ProtocolManager.protocolId(clazz); var registration = parseProtocolRegistration(clazz, module); - if (!clazz.isAnnotationPresent(NotEnhance.class)) { - enhanceList.add(registration); - } else if (protocolDefinitionMap.getOrDefault(clazz.getName(), true)) { + boolean isEnhance = protocolDefinitionMap.getOrDefault(clazz.getName(), true); + if (isEnhance && !clazz.isAnnotationPresent(NotEnhance.class)) { enhanceList.add(registration); } // 注册协议