Merge pull request #13 from codingapi/dev

xlorne · web-flow · commit de4dd4ab1e88 · 2017-11-29T13:31:11.000+08:00
发布v4.0.2
diff --git a/pom.xml b/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>
diff --git a/transaction-dubbo/pom.xml b/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>
diff --git a/transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/service/impl/TimeOutServiceImpl.java b/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;
     }
 }
diff --git a/transaction-motan/pom.xml b/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-->
diff --git a/transaction-motan/src/main/java/com/codingapi/tx/motan/service/impl/TimeOutServiceImpl.java b/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;
     }
 }
diff --git a/transaction-springcloud/pom.xml b/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>
diff --git a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/service/impl/TimeOutServiceImpl.java b/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;
diff --git a/tx-client/pom.xml b/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>
diff --git a/tx-client/src/main/java/com/codingapi/tx/Constants.java b/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;
 
     /**
      * 模块唯一标示
diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/NettyServiceImpl.java b/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() {
diff --git a/tx-manager/pom.xml b/tx-manager/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-manager</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.2</version>
     <packaging>jar</packaging>
 
     <name>tx-manager</name>
diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/EurekaServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/EurekaServiceImpl.java
@@ -13,7 +13,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.client.serviceregistry.Registration;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
diff --git a/tx-manager/src/main/java/com/codingapi/tm/redis/RedisConfig.java b/tx-manager/src/main/java/com/codingapi/tm/redis/RedisConfig.java
@@ -2,11 +2,9 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -16,7 +14,7 @@
  * Created by lorne on 2017/7/5.
  */
 
-@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
+@Configuration
 public class RedisConfig {
 
     private static Logger logger = LoggerFactory.getLogger(RedisConfig.class);
diff --git a/tx-manager/src/main/resources/application.properties b/tx-manager/src/main/resources/application.properties
@@ -59,7 +59,7 @@ tm.compensate.notifyUrl=http://ip:port/path
 #补偿失败，再次尝试间隔（秒），最大尝试次数3次，当超过3次即为补偿失败。
 tm.compensate.tryTime=30
 
-#各组件自动补偿的时间上限
+#各事务模块自动补偿的时间上限
 tm.auto.compensate.limit=20
 
 
diff --git a/tx-manager/src/main/resources/static/index.html b/tx-manager/src/main/resources/static/index.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="UTF-8"/>
-    <title>TxManager v4.0.2-SNAPSHOT</title>
+    <title>TxManager v4.0.2</title>
     <!-- 最新版本的 Bootstrap 核心 CSS 文件 -->
     <link rel="stylesheet" href="static/bootstrap/css/bootstrap.min.css"/>
     <script src="static/jquery/jquery.min.js"></script>
@@ -24,7 +24,7 @@
 <body>
 <div class="container">
 
-    <h3 class="text-center">TxManagerV4.0.2-SNAPSHOT 服务已启动</h3>
+    <h3 class="text-center">TxManagerV4.0.2 服务已启动</h3>
     <div class="table-responsive">
         <table class="table table-bordered table-striped">
             <colgroup>
@@ -116,6 +116,12 @@ <h3 class="text-center">TxManagerV4.0.2-SNAPSHOT 服务已启动</h3>
                 </th>
                 <td><span id="compensateTryTime"></span></td>
             </tr>
+            <tr>
+                <th scope="row">
+                    各事务模块自动补偿的时间上限(秒)
+                </th>
+                <td><span id="autoCompensateLimit"></span></td>
+            </tr>
             </tbody>
         </table>
 
diff --git a/tx-plugins-db/pom.xml b/tx-plugins-db/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-plugins-db</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.2</version>
 
     <name>tx-plugins-db</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.0.2</version>
         </dependency>
 
 
diff --git a/tx-plugins-nodb/pom.xml b/tx-plugins-nodb/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-plugins-nodb</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.2</version>
 
     <name>tx-plugins-nodb</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>
 
 
diff --git a/tx-plugins-redis/pom.xml b/tx-plugins-redis/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-plugins-redis</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.2</version>
 
     <name>tx-plugins-redis</name>
     <description>tx-plugins-redis project for Spring Boot</description>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>4.0.2-SNAPSHOT</version>
+            <version>4.0.2</version>
         </dependency>
 
         <dependency>

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class TimeOutServiceImpl implements TimeOutService {`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`public void loadOutTime(int timeOut) {`
`22`		`- int finalTimeOut = (null != providerConfig.getTimeout()) ? providerConfig.getTimeout() : timeOut;`
	`22`	`+ int finalTimeOut = (null != providerConfig.getTimeout()) ? providerConfig.getTimeout() : (timeOut * 1000);`
`23`	`23`	`Constants.maxOutTime = finalTimeOut;`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class TimeOutServiceImpl implements TimeOutService {`
`25`	`25`	`* @param timeOut timeOut`
`26`	`26`	`*/`
`27`	`27`	`public void loadOutTime(int timeOut) {`
`28`		`- int finalTimeOut = (null != basicServiceConfigBean.getRequestTimeout() ? basicServiceConfigBean.getRequestTimeout() : timeOut);`
`29`		`- Constants.maxOutTime = timeOut;`
	`28`	`+ int finalTimeOut = (null != basicServiceConfigBean.getRequestTimeout()) ? basicServiceConfigBean.getRequestTimeout() : (timeOut * 1000);`
	`29`	`+ Constants.maxOutTime = finalTimeOut;`
`30`	`30`	`}`
`31`	`31`	`}`