From f9dca4e6ddecdb68470aa6c2060434b605a16045 Mon Sep 17 00:00:00 2001 From: wangliang <1991wangliang@gmail.com> Date: Wed, 20 Dec 2017 21:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86listener=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E5=90=84=E4=B8=AArpc=E6=A1=86=E6=9E=B6=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../listener/TransactionSocketListener.java | 2 +- .../listener/TransactionSocketListener.java | 26 +++++++++++++++++++ .../springcloud/listener/ServerListener.java | 12 +++++++++ .../main/java/com/codingapi/tx/Constants.java | 5 ---- .../service/impl/InitServiceImpl.java | 13 ---------- .../service/impl/MicroServiceImpl.java | 2 +- .../tm/netty/handler/TxCoreServerHandler.java | 2 +- 8 files changed, 42 insertions(+), 21 deletions(-) rename {tx-client/src/main/java/com/codingapi/tx => transaction-dubbo/src/main/java/com/codingapi/tx/dubbo}/listener/TransactionSocketListener.java (94%) create mode 100644 transaction-motan/src/main/java/com/codingapi/tx/motan/listener/TransactionSocketListener.java diff --git a/pom.xml b/pom.xml index 5c75e0501..77c5b7293 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,7 @@ + org.apache.maven.plugins maven-gpg-plugin diff --git a/tx-client/src/main/java/com/codingapi/tx/listener/TransactionSocketListener.java b/transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/listener/TransactionSocketListener.java similarity index 94% rename from tx-client/src/main/java/com/codingapi/tx/listener/TransactionSocketListener.java rename to transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/listener/TransactionSocketListener.java index 738185c89..817edf9b0 100644 --- a/tx-client/src/main/java/com/codingapi/tx/listener/TransactionSocketListener.java +++ b/transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/listener/TransactionSocketListener.java @@ -1,4 +1,4 @@ -package com.codingapi.tx.listener; +package com.codingapi.tx.dubbo.listener; import com.codingapi.tx.listener.service.InitService; import org.springframework.beans.BeansException; diff --git a/transaction-motan/src/main/java/com/codingapi/tx/motan/listener/TransactionSocketListener.java b/transaction-motan/src/main/java/com/codingapi/tx/motan/listener/TransactionSocketListener.java new file mode 100644 index 000000000..b0ae2bff1 --- /dev/null +++ b/transaction-motan/src/main/java/com/codingapi/tx/motan/listener/TransactionSocketListener.java @@ -0,0 +1,26 @@ +package com.codingapi.tx.motan.listener; + +import com.codingapi.tx.listener.service.InitService; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +/** + * Created by lorne on 2017/7/1. + */ +@Component +public class TransactionSocketListener implements ApplicationContextAware { + + + @Autowired + private InitService initService; + + + @Override + public void setApplicationContext(ApplicationContext event) throws BeansException { + initService.start(); + } + +} diff --git a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java index a08d57ee8..b936ec38e 100644 --- a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java +++ b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java @@ -1,5 +1,9 @@ package com.codingapi.tx.springcloud.listener; +import com.codingapi.tx.listener.service.InitService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; @@ -8,11 +12,19 @@ @Component public class ServerListener implements ApplicationListener { + private Logger logger = LoggerFactory.getLogger(ServerListener.class); + private int serverPort; + @Autowired + private InitService initService; + @Override public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) { + logger.info("onApplicationEvent -> onApplicationEvent. "+event.getEmbeddedServletContainer()); this.serverPort = event.getEmbeddedServletContainer().getPort(); + + initService.start(); } public int getPort() { 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 52a88d694..5612fdc19 100644 --- a/tx-client/src/main/java/com/codingapi/tx/Constants.java +++ b/tx-client/src/main/java/com/codingapi/tx/Constants.java @@ -21,10 +21,5 @@ public class Constants { */ public static int maxOutTime = 10000; - /** - * 模块唯一标示 - */ - public static String uniqueKey; - } diff --git a/tx-client/src/main/java/com/codingapi/tx/listener/service/impl/InitServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/listener/service/impl/InitServiceImpl.java index d293bc7ad..c31394882 100644 --- a/tx-client/src/main/java/com/codingapi/tx/listener/service/impl/InitServiceImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/listener/service/impl/InitServiceImpl.java @@ -1,8 +1,6 @@ package com.codingapi.tx.listener.service.impl; -import com.codingapi.tx.Constants; import com.codingapi.tx.listener.service.InitService; -import com.codingapi.tx.listener.service.ModelNameService; import com.codingapi.tx.netty.service.NettyService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,20 +18,9 @@ public class InitServiceImpl implements InitService { @Autowired private NettyService nettyService; - - @Autowired - private ModelNameService modelNameService; - - @Override public void start() { - /** - * 设置模块唯一标示 - */ - - Constants.uniqueKey = modelNameService.getUniqueKey(); - nettyService.start(); logger.info("socket-start.."); diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java index e7168f72e..04c980131 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java @@ -60,7 +60,7 @@ private boolean isIp(String ipAddress) { public List getConfigServiceInstances() { Application application = eurekaClient.getApplication(tmKey); if (application == null) { - logger.error("获取eureka服务失败！"); + logger.error("get eureka server error!"); } return application != null ? application.getInstances() : new ArrayList<>(); } diff --git a/tx-manager/src/main/java/com/codingapi/tm/netty/handler/TxCoreServerHandler.java b/tx-manager/src/main/java/com/codingapi/tm/netty/handler/TxCoreServerHandler.java index 01234291d..26a9acc2a 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/netty/handler/TxCoreServerHandler.java +++ b/tx-manager/src/main/java/com/codingapi/tm/netty/handler/TxCoreServerHandler.java @@ -48,7 +48,7 @@ public TxCoreServerHandler(NettyService nettyService) { @Override public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception { final String json = SocketUtils.getJson(msg); - logger.info("接受->"+json); + logger.info("request->"+json); threadPool.execute(new Runnable() { @Override public void run() {