From e046a9c1ca5df9bf3251f290ddc780a1822d1dd4 Mon Sep 17 00:00:00 2001 From: wangliang <1991wangliang@gmail.com> Date: Wed, 29 Nov 2017 13:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=834.0.2=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- transaction-dubbo/pom.xml | 4 ++-- .../service/impl/TimeOutServiceImpl.java | 2 +- transaction-motan/pom.xml | 4 ++-- .../service/impl/TimeOutServiceImpl.java | 4 ++-- transaction-springcloud/pom.xml | 4 ++-- .../service/impl/TimeOutServiceImpl.java | 5 +---- tx-client/pom.xml | 2 +- .../main/java/com/codingapi/tx/Constants.java | 4 ++-- .../netty/service/impl/NettyServiceImpl.java | 20 +++---------------- tx-manager/pom.xml | 2 +- .../service/impl/EurekaServiceImpl.java | 1 - .../com/codingapi/tm/redis/RedisConfig.java | 6 ++---- .../src/main/resources/application.properties | 2 +- .../src/main/resources/static/index.html | 10 ++++++++-- tx-plugins-db/pom.xml | 4 ++-- tx-plugins-nodb/pom.xml | 4 ++-- tx-plugins-redis/pom.xml | 4 ++-- 18 files changed, 35 insertions(+), 49 deletions(-) diff --git a/pom.xml b/pom.xml index d6fa6c856..a892168fe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.codingapi tx-lcn - 4.0.2-SNAPSHOT + 4.0.2 pom tx-lcn diff --git a/transaction-dubbo/pom.xml b/transaction-dubbo/pom.xml index 4fec146af..86d4f79ae 100644 --- a/transaction-dubbo/pom.xml +++ b/transaction-dubbo/pom.xml @@ -7,7 +7,7 @@ com.codingapi transaction-dubbo - 4.0.2-SNAPSHOT + 4.0.2 transaction-dubbo https://github.com/codingapi/tx-lcn @@ -68,7 +68,7 @@ com.codingapi tx-client - 4.0.2-SNAPSHOT + 4.0.2 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 index 9d4b7d970..0ed3747dc 100644 --- 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 index 19e031180..7d398e998 100644 --- a/transaction-motan/pom.xml +++ b/transaction-motan/pom.xml @@ -6,7 +6,7 @@ com.codingapi transaction-motan - 4.0.2-SNAPSHOT + 4.0.2 transaction-motan https://github.com/codingapi/tx-lcn @@ -66,7 +66,7 @@ com.codingapi tx-client - 4.0.2-SNAPSHOT + 4.0.2 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 index b261fa6aa..913b01698 100644 --- 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 index 48ac25e83..c5c91a5fc 100644 --- a/transaction-springcloud/pom.xml +++ b/transaction-springcloud/pom.xml @@ -5,7 +5,7 @@ com.codingapi transaction-springcloud - 4.0.2-SNAPSHOT + 4.0.2 transaction-springcloud https://github.com/codingapi/tx-lcn @@ -69,7 +69,7 @@ com.codingapi tx-client - 4.0.2-SNAPSHOT + 4.0.2 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 index 518e7f609..8fcc41cc2 100644 --- 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 index 97ccf0926..c9c2bd970 100644 --- a/tx-client/pom.xml +++ b/tx-client/pom.xml @@ -5,7 +5,7 @@ com.codingapi tx-client - 4.0.2-SNAPSHOT + 4.0.2 tx-client https://github.com/codingapi/tx-lcn diff --git a/tx-client/src/main/java/com/codingapi/tx/Constants.java b/tx-client/src/main/java/com/codingapi/tx/Constants.java index 5824061e6..a2041ccbe 100644 --- 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 index 32eb14dfa..5f00e0452 100644 --- 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 index b69a4609b..4dc39d7b8 100644 --- a/tx-manager/pom.xml +++ b/tx-manager/pom.xml @@ -5,7 +5,7 @@ com.codingapi tx-manager - 4.0.2-SNAPSHOT + 4.0.2 jar tx-manager 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 index c099d589f..f89654bf7 100644 --- 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 index fb898a408..4bad0dc84 100644 --- 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 index 2abbe922d..d3b411308 100644 --- 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 index c5027279f..727cd991c 100644 --- a/tx-manager/src/main/resources/static/index.html +++ b/tx-manager/src/main/resources/static/index.html @@ -2,7 +2,7 @@ - TxManager v4.0.2-SNAPSHOT + TxManager v4.0.2 @@ -24,7 +24,7 @@
-

TxManagerV4.0.2-SNAPSHOT 服务已启动

+

TxManagerV4.0.2 服务已启动

@@ -116,6 +116,12 @@

TxManagerV4.0.2-SNAPSHOT 服务已启动

+ + + +
+ 各事务模块自动补偿的时间上限(秒) +
diff --git a/tx-plugins-db/pom.xml b/tx-plugins-db/pom.xml index 6fd16bff6..aaf5f41f9 100644 --- a/tx-plugins-db/pom.xml +++ b/tx-plugins-db/pom.xml @@ -5,7 +5,7 @@ com.codingapi tx-plugins-db - 4.0.2-SNAPSHOT + 4.0.2 tx-plugins-db https://github.com/codingapi/tx-lcn @@ -67,7 +67,7 @@ com.codingapi tx-client - 4.0.2-SNAPSHOT + 4.0.2 diff --git a/tx-plugins-nodb/pom.xml b/tx-plugins-nodb/pom.xml index 3448f3187..6f468a011 100644 --- a/tx-plugins-nodb/pom.xml +++ b/tx-plugins-nodb/pom.xml @@ -5,7 +5,7 @@ com.codingapi tx-plugins-nodb - 4.0.2-SNAPSHOT + 4.0.2 tx-plugins-nodb https://github.com/codingapi/tx-lcn @@ -68,7 +68,7 @@ com.codingapi tx-client - 4.0.2-SNAPSHOT + 4.0.2 diff --git a/tx-plugins-redis/pom.xml b/tx-plugins-redis/pom.xml index fb56cc209..ab4a3c3ad 100644 --- a/tx-plugins-redis/pom.xml +++ b/tx-plugins-redis/pom.xml @@ -5,7 +5,7 @@ com.codingapi tx-plugins-redis - 4.0.2-SNAPSHOT + 4.0.2 tx-plugins-redis tx-plugins-redis project for Spring Boot @@ -74,7 +74,7 @@ com.codingapi tx-client - 4.0.2-SNAPSHOT + 4.0.2