Merge pull request #5 from codingapi/tx-lcn-motan

Tx lcn motan

Author: xlorne

transaction-motan/pom.xml

@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.7</java.version>
-        <motan>0.3.1</motan>
+        <motan>1.0.0</motan>
     </properties>
 
     <dependencies>
@@ -153,20 +153,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

transaction-motan/src/main/java/com/codingapi/tx/motan/filter/TransactionFilter.java

@@ -21,7 +21,7 @@
 @SpiMeta(name = "transaction")
 @Activation(key = {MotanConstants.NODE_TYPE_SERVICE, MotanConstants.NODE_TYPE_REFERER})
 public class TransactionFilter implements Filter {
-    
+
     public Response filter(Caller<?> caller, Request request) {
         TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
         if (txTransactionLocal != null) {

tx-client/src/main/java/com/codingapi/tx/netty/handler/TransactionHandler.java

@@ -42,15 +42,14 @@ public TransactionHandler(NettyControlService nettyControlService, int delay) {
     }
 
 
-
     @Override
     public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
 
         String json = SocketUtils.getJson(msg);
 
         logger.info("TxManager-response->" + json);
 
-        nettyControlService.executeService(ctx,json);
+        nettyControlService.executeService(ctx, json);
     }
 
     @Override
@@ -76,9 +75,18 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
         logger.info("try connection -->" + ctx);
 
         nettyControlService.uploadModelInfo();
+        //通道激活后进行心跳检查
+        SocketUtils.sendMsg(ctx, heartJson);
     }
 
 
+    /**
+     * 当客户端的所有ChannelHandler中4s内没有write事件，则会触发userEventTriggered方法
+     *
+     * @param ctx
+     * @param evt
+     * @throws Exception
+     */
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
         //心跳配置