Merge branch 'onlyData' of http://git.jiayuepowertech.com:9022/xiuwei/protocol into onlyData

# Conflicts:
升版本
#	pom.xml

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>wei.yigulu</groupId>
     <artifactId>protocol</artifactId>
-    <version>1.2.21</version>
+    <version>1.2.23</version>
     <packaging>pom</packaging>
     <modules>
         <module>protocol-core</module>
@@ -32,9 +32,9 @@
         <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.2.21</protocol.version>
-        <iec104.version>1.4.26</iec104.version>
-        <modbus.version>1.2.6</modbus.version>
+        <protocol.version>1.2.23</protocol.version>
+        <iec104.version>1.4.28</iec104.version>
+        <modbus.version>1.2.8</modbus.version>
         <cdt.version>1.0.1</cdt.version>
     </properties>
     <distributionManagement>

protocol-all/pom.xml

@@ -6,14 +6,14 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.2.21</version>
+        <version>1.2.23</version>
     </parent>
 
 
 
     <packaging>jar</packaging>
     <artifactId>protocol-all</artifactId>
-    <version>1.2.21</version>
+    <version>1.2.23</version>
 
     <dependencies>
         <dependency>

protocol-cdt/pom.xml

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

protocol-core/pom.xml

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

protocol-core/src/main/java/wei/yigulu/netty/AbstractTcpMasterBuilder.java

@@ -73,11 +73,11 @@ public abstract class AbstractTcpMasterBuilder extends AbstractMasterBuilder {
 				this.future.removeListener(getOrCreateConnectionListener());
 				this.future.addListener(ChannelFutureListener.CLOSE);
 				future = null;
-			}
-			try {
-				Thread.sleep(5000L);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
+				try {
+					Thread.sleep(5000L);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
 			}
 			log.debug("创建连接");
 			try {

protocol-iec104/pom.xml

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

protocol-modbus/pom.xml

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