浏览代码

修正104 重连的 逻辑错误

xiuwei 4 年之前
父节点
当前提交
6693e7268e

+ 3 - 3
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>wei.yigulu</groupId>
     <artifactId>protocol</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <packaging>pom</packaging>
     <modules>
         <module>protocol-core</module>
@@ -32,8 +32,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <protocol.version>1.1.4</protocol.version>
-        <iec104.version>1.4.10</iec104.version>
+        <protocol.version>1.1.5</protocol.version>
+        <iec104.version>1.4.11</iec104.version>
         <modbus.version>1.2.3</modbus.version>
         <cdt.version>1.0.0</cdt.version>
     </properties>

+ 1 - 1
protocol-all/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
 
 

+ 1 - 1
protocol-cdt/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
protocol-core/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>protocol-core</artifactId>
-
+    <version>${project.parent.version}</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
protocol-iec104/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 0 - 1
protocol-iec104/src/main/java/wei/yigulu/iec104/nettyconfig/Master104Handle.java

@@ -138,7 +138,6 @@ public class Master104Handle extends SimpleChannelInboundHandler<ByteBuf> {
 		if (masterBuilder != null) {
 			this.testNum = 0;
 			this.exceptionNum = 0;
-			this.isInitiative = false;
 			log.error(masterBuilder.getIp() + ":" + masterBuilder.getPort() + "断线,尝试重连");
 			masterBuilder.getOrCreateConnectionListener().operationComplete(masterBuilder.getFuture());
 		}

+ 1 - 1
protocol-modbus/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <version>${modbus.version}</version>