将listener移动到各个rpc框架下

codingapi · Dec 20, 2017 · f9dca4e · f9dca4e
1 parent 1d49a44
commit f9dca4e
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -132,6 +132,7 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- 手动打包时，将下面的plugin注释掉 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>

diff --git a/...x/listener/TransactionSocketListener.java → ...o/listener/TransactionSocketListener.java b/...x/listener/TransactionSocketListener.java → ...o/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/...action-motan/src/main/java/com/codingapi/tx/motan/listener/TransactionSocketListener.java b/...action-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/...ction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java b/...ction-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<EmbeddedServletContainerInitializedEvent> {
 
+    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
@@ -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
@@ -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
@@ -60,7 +60,7 @@ private boolean isIp(String ipAddress) {
     public List<InstanceInfo> 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
@@ -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() {