diff --git a/net/src/main/java/com/zfoo/net/config/model/NetConfig.java b/net/src/main/java/com/zfoo/net/config/model/NetConfig.java
index c9af0984..bce4b9db 100644
--- a/net/src/main/java/com/zfoo/net/config/model/NetConfig.java
+++ b/net/src/main/java/com/zfoo/net/config/model/NetConfig.java
@@ -27,7 +27,7 @@ public class NetConfig {
/**
* {@link GenerateOperation}
*/
- private boolean mergerProtocol;
+ private boolean mergeProtocol;
/**
* {@link GenerateOperation}
*/
@@ -81,12 +81,12 @@ public class NetConfig {
this.protocolLocation = protocolLocation;
}
- public boolean isMergerProtocol() {
- return mergerProtocol;
+ public boolean isMergeProtocol() {
+ return mergeProtocol;
}
- public void setMergerProtocol(boolean mergerProtocol) {
- this.mergerProtocol = mergerProtocol;
+ public void setMergeProtocol(boolean mergeProtocol) {
+ this.mergeProtocol = mergeProtocol;
}
public boolean isFoldProtocol() {
diff --git a/net/src/main/java/com/zfoo/net/packet/PacketService.java b/net/src/main/java/com/zfoo/net/packet/PacketService.java
index 687b00ef..9269dae1 100644
--- a/net/src/main/java/com/zfoo/net/packet/PacketService.java
+++ b/net/src/main/java/com/zfoo/net/packet/PacketService.java
@@ -92,7 +92,7 @@ public class PacketService implements IPacketService {
var protocolLocation = netConfig.getProtocolLocation();
var generateOperation = new GenerateOperation();
- generateOperation.setMergeProtocol(netConfig.isMergerProtocol());
+ generateOperation.setMergeProtocol(netConfig.isMergeProtocol());
generateOperation.setFoldProtocol(netConfig.isFoldProtocol());
generateOperation.setProtocolPath(netConfig.getProtocolPath());
generateOperation.setProtocolParam(netConfig.getProtocolParam());
diff --git a/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java b/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java
index a92557c3..d1bae09c 100644
--- a/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java
+++ b/net/src/main/java/com/zfoo/net/schema/NetDefinitionParser.java
@@ -102,7 +102,7 @@ public class NetDefinitionParser implements BeanDefinitionParser {
resolvePlaceholder("protocol-location", "protocolLocation", builder, element, parserContext);
// 协议文件是否生成在同一个协议文件中
- resolvePlaceholder("merger-protocol", "mergerProtocol", builder, element, parserContext);
+ resolvePlaceholder("merge-protocol", "mergeProtocol", builder, element, parserContext);
// 文件是否折叠
resolvePlaceholder("fold-protocol", "foldProtocol", builder, element, parserContext);
// 生成各种语言的协议列表
diff --git a/net/src/main/resources/net-1.0.xsd b/net/src/main/resources/net-1.0.xsd
index 49beda8a..3a2ee845 100644
--- a/net/src/main/resources/net-1.0.xsd
+++ b/net/src/main/resources/net-1.0.xsd
@@ -65,7 +65,7 @@
-
+