Merge pull request #13 from codingapi/dev

发布v4.0.2

Author: xlorne

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-lcn</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.2</version>
     <packaging>pom</packaging>
 
     <name>tx-lcn</name>

transaction-dubbo/pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>transaction-dubbo</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.2</version>
 
     <name>transaction-dubbo</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.0.2</version>
         </dependency>
 
         <dependency>

transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/service/impl/TimeOutServiceImpl.java

@@ -19,7 +19,7 @@ public class TimeOutServiceImpl implements TimeOutService {
 
     @Override
     public void loadOutTime(int timeOut) {
-        int finalTimeOut = (null != providerConfig.getTimeout()) ? providerConfig.getTimeout() : timeOut;
+        int finalTimeOut = (null != providerConfig.getTimeout()) ? providerConfig.getTimeout() : (timeOut * 1000);
         Constants.maxOutTime = finalTimeOut;
     }
 }

transaction-motan/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>transaction-motan</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.2</version>
 
     <name>transaction-motan</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.0.2</version>
         </dependency>
 
         <!-- motan config start-->

transaction-motan/src/main/java/com/codingapi/tx/motan/service/impl/TimeOutServiceImpl.java

@@ -25,7 +25,7 @@ public class TimeOutServiceImpl implements TimeOutService {
      * @param timeOut  timeOut
      */
     public void loadOutTime(int timeOut) {
-        int finalTimeOut = (null != basicServiceConfigBean.getRequestTimeout() ? basicServiceConfigBean.getRequestTimeout() : timeOut);
-        Constants.maxOutTime = timeOut;
+        int finalTimeOut = (null != basicServiceConfigBean.getRequestTimeout()) ? basicServiceConfigBean.getRequestTimeout() : (timeOut * 1000);
+        Constants.maxOutTime = finalTimeOut;
     }
 }

transaction-springcloud/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.codingapi</groupId>
 	<artifactId>transaction-springcloud</artifactId>
-	<version>4.0.2-SNAPSHOT</version>
+	<version>4.0.2</version>
 
 	<name>transaction-springcloud</name>
 	<url>https://github.com/codingapi/tx-lcn</url>
@@ -69,7 +69,7 @@
 		<dependency>
 			<groupId>com.codingapi</groupId>
 			<artifactId>tx-client</artifactId>
-			<version>4.0.2-SNAPSHOT</version>
+			<version>4.0.2</version>
 		</dependency>
 
 		<dependency>

transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/service/impl/TimeOutServiceImpl.java

@@ -13,11 +13,8 @@ public class TimeOutServiceImpl implements TimeOutService {
 
     @Override
     public void loadOutTime(int timeOut) {
-        //todo 暂时写死
-        /*int timeOut = 20*1000;
-        Constants.maxOutTime = timeOut;*/
     	//从txManager取
-    	if(timeOut < 0){
+    	if(timeOut <= 0){
     		Constants.maxOutTime = 20*1000;
     	} else {
     		Constants.maxOutTime = timeOut*1000;

tx-client/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-client</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.2</version>
 
     <name>tx-client</name>
     <url>https://github.com/codingapi/tx-lcn</url>

tx-client/src/main/java/com/codingapi/tx/Constants.java

@@ -17,9 +17,9 @@ public class Constants {
 
 
     /**
-     * 最大模块超时时间
+     * 最大模块超时时间（毫秒）
      */
-    public static int maxOutTime = 10;
+    public static int maxOutTime = 10000;
 
     /**
      * 模块唯一标示

tx-client/src/main/java/com/codingapi/tx/netty/service/impl/NettyServiceImpl.java

@@ -35,7 +35,7 @@ public class NettyServiceImpl implements NettyService {
 
     @Autowired
     private NettyControlService nettyControlService;
-    
+
     @Autowired
     private TimeOutService timeOutService;
 
@@ -62,7 +62,7 @@ public synchronized void start() {
         int autoCompensateLimit = Constants.txServer.getAutoCompensateLimit();
 
         final TransactionHandler transactionHandler = new TransactionHandler(nettyControlService, delay);
-        
+
         timeOutService.loadOutTime(autoCompensateLimit);
         workerGroup = new NioEventLoopGroup();
         try {
@@ -102,16 +102,7 @@ public void run() {
             });
 
         } catch (Exception e) {
-            e.printStackTrace();
-
-//            isStarting = false;
-//
-//            //断开重新连接机制
-//            close();
-//
-//            if (e instanceof ConnectTimeoutException) {
-//                start();
-//            }
+            logger.error(e.getLocalizedMessage());
         }
     }
 
@@ -126,11 +117,6 @@ public synchronized void close() {
         }
     }
 
-//
-//    @Override
-//    public String sendMsg(Request request) {
-//        return transactionHandler.sendMsg(request);
-//    }
 
     @Override
     public boolean checkState() {