修复已知bug

Author: xlorne

tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java

@@ -83,50 +83,56 @@ public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) th
             new Thread(new HookRunnable() {
                 @Override
                 public void run0() {
-                    if(task.isAwait()) {
 
-                        int rs = txManagerService.closeTransactionGroup(groupId, resState);
+                    while (!task.isAwait() && !Thread.currentThread().interrupted()) {
+                        try {
+                            Thread.sleep(1);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
 
-                        int lastState = rs==-1?0:resState;
+                    int rs = txManagerService.closeTransactionGroup(groupId, resState);
 
-                        int executeConnectionError = 0;
+                    int lastState = rs==-1?0:resState;
 
-                        //控制本地事务的数据提交
-                        final TxTask waitTask = TaskGroupManager.getInstance().getTask(groupId, type);
-                        if(waitTask!=null){
-                            waitTask.setState(lastState);
-                            waitTask.signalTask();
+                    int executeConnectionError = 0;
 
-                            while (!waitTask.isRemove()){
-                                try {
-                                    Thread.sleep(1);
-                                } catch (InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                            }
+                    //控制本地事务的数据提交
+                    final TxTask waitTask = TaskGroupManager.getInstance().getTask(groupId, type);
+                    if(waitTask!=null){
+                        waitTask.setState(lastState);
+                        waitTask.signalTask();
 
-                            if(waitTask.getState()== TaskState.connectionError.getCode()){
-                                //本地执行失败.
-                                executeConnectionError = 1;
-
-                                lastState = 0;
+                        while (!waitTask.isRemove()){
+                            try {
+                                Thread.sleep(1);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
                             }
                         }
 
+                        if(waitTask.getState()== TaskState.connectionError.getCode()){
+                            //本地执行失败.
+                            executeConnectionError = 1;
 
-                        if (compensateLocal == null) {
-                            long end = System.currentTimeMillis();
-                            long time = end - start;
-                            if (executeConnectionError == 1||(lastState == 1 && rs == 0)) {
-                                //记录补偿日志
-                                txManagerService.sendCompensateMsg(groupId, time, info,executeConnectionError);
-                            }
+                            lastState = 0;
                         }
+                    }
 
-                        task.setState(lastState);
-                        task.signalTask();
+                    if (compensateLocal == null) {
+                        long end = System.currentTimeMillis();
+                        long time = end - start;
+                        if (executeConnectionError == 1||(lastState == 1 && rs == 0)) {
+                            //记录补偿日志
+                            txManagerService.sendCompensateMsg(groupId, time, info,executeConnectionError);
+                        }
                     }
+
+                    task.setState(lastState);
+                    task.signalTask();
                 }
+
             }).start();
 
             task.awaitTask();

tx-client/src/main/java/com/codingapi/tx/framework/utils/IpAddressUtils.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2017. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
+ * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
+ * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
+ * Vestibulum commodo. Ut rhoncus gravida arcu.
+ */
+
+package com.codingapi.tx.framework.utils;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * create by lorne on 2017/12/12
+ */
+public class IpAddressUtils {
+
+
+    public static boolean isIpAddress(String ipAddress){
+        String ipAddressRegex = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}:([0-9]|[1-9]\\d{1,3}|[1-5]\\d{4}|6[0-5][0-9][0-3][0-5])";
+        Pattern ipAddressPattern = Pattern.compile(ipAddressRegex);
+        Matcher matcher = ipAddressPattern.matcher(ipAddress);
+        return matcher.matches();
+    }
+
+    public static boolean isIpFormat(String ipAddress){
+        return ipAddress.contains(":");
+    }
+
+    public static String getIpByDomain(String domain){
+        InetAddress ip= null;
+        try {
+            ip = InetAddress.getByName(domain);
+        } catch (UnknownHostException e) {
+            return null;
+        }
+        return ip.getHostAddress();
+    }
+
+
+    public static boolean isIp(String ipString) {
+        String ipRegex = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
+        Pattern pattern = Pattern.compile(ipRegex);
+        Matcher matcher = pattern.matcher(ipString);
+        return matcher.matches();
+    }
+
+
+}

tx-client/src/main/java/com/codingapi/tx/netty/service/impl/NettyControlServiceImpl.java

@@ -7,7 +7,7 @@
 import com.codingapi.tx.netty.service.MQTxManagerService;
 import com.codingapi.tx.netty.service.NettyControlService;
 import com.codingapi.tx.netty.service.NettyService;
-import com.codingapi.tx.netty.utils.IpAddressUtils;
+import com.codingapi.tx.framework.utils.IpAddressUtils;
 import com.lorne.core.framework.utils.task.ConditionUtils;
 import com.lorne.core.framework.utils.task.IBack;
 import com.lorne.core.framework.utils.task.Task;

tx-client/src/main/java/com/codingapi/tx/netty/utils/IpAddressUtils.java

@@ -0,0 +1,46 @@
+package com.codingapi.tm.framework.utils;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * create by lorne on 2017/12/12
+ */
+public class IpAddressUtils {
+
+
+    public static boolean isIpAddress(String ipAddress){
+        String ipAddressRegex = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}:([0-9]|[1-9]\\d{1,3}|[1-5]\\d{4}|6[0-5][0-9][0-3][0-5])";
+        Pattern ipAddressPattern = Pattern.compile(ipAddressRegex);
+        Matcher matcher = ipAddressPattern.matcher(ipAddress);
+        return matcher.matches();
+    }
+
+    public static boolean isIpFormat(String ipAddress){
+        return ipAddress.contains(":");
+    }
+
+    public static String getIpByDomain(String domain){
+        InetAddress ip= null;
+        try {
+            ip = InetAddress.getByName(domain);
+        } catch (UnknownHostException e) {
+            return null;
+        }
+        return ip.getHostAddress();
+    }
+
+
+    public static boolean isIp(String ipString) {
+        String ipRegex = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
+        Pattern pattern = Pattern.compile(ipRegex);
+        Matcher matcher = pattern.matcher(ipString);
+        return matcher.matches();
+    }
+
+
+
+
+}

tx-manager/src/main/java/com/codingapi/tm/framework/utils/IpAddressUtils.java

@@ -2,6 +2,7 @@
 
 import com.codingapi.tm.Constants;
 import com.codingapi.tm.config.ConfigReader;
+import com.codingapi.tm.framework.utils.IpAddressUtils;
 import com.codingapi.tm.framework.utils.SocketManager;
 import com.codingapi.tm.manager.service.MicroService;
 import com.codingapi.tm.model.TxServer;
@@ -18,8 +19,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * create by lorne on 2017/11/11
@@ -43,19 +42,10 @@ public class MicroServiceImpl implements MicroService {
     private EurekaClient eurekaClient;
 
 
-
-
     /** logger */
     private static final Logger logger = LoggerFactory.getLogger(MicroServiceImpl.class);
 
 
-    private boolean isIp(String ipAddress) {
-        String ip = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
-        Pattern pattern = Pattern.compile(ip);
-        Matcher matcher = pattern.matcher(ipAddress);
-        return matcher.matches();
-    }
-
 
     public List<InstanceInfo> getConfigServiceInstances() {
         Application application = eurekaClient.getApplication(tmKey);
@@ -70,10 +60,7 @@ public TxState getState() {
         TxState state = new TxState();
 
         //String ipAddress = EurekaServerContextHolder.getInstance().getServerContext().getApplicationInfoManager().getEurekaInstanceConfig().getIpAddress();
-        String ipAddress = discoveryClient.getLocalServiceInstance().getHost();
-        if(!isIp(ipAddress)){
-            ipAddress = "127.0.0.1";
-        }
+        String ipAddress = getIp(discoveryClient.getLocalServiceInstance().getHost());
         state.setIp(ipAddress);
         state.setPort(Constants.socketPort);
         state.setMaxConnection(SocketManager.getInstance().getMaxConnection());
@@ -90,18 +77,28 @@ public TxState getState() {
     }
 
 
+    private String getIp(String ipAddress){
+        if(!IpAddressUtils.isIp(ipAddress)){
+
+            ipAddress = IpAddressUtils.getIpByDomain(ipAddress);
+
+            if(ipAddress==null||!IpAddressUtils.isIp(ipAddress)) {
+                ipAddress = "127.0.0.1";
+            }
+        }
+        return ipAddress;
+    }
+
     private List<String> getServices(){
         List<String> urls = new ArrayList<>();
         List<InstanceInfo> instanceInfos =getConfigServiceInstances();
         for (InstanceInfo instanceInfo : instanceInfos) {
             String url = instanceInfo.getHomePageUrl();
             String address = instanceInfo.getIPAddr();
-            if (isIp(address)) {
-                urls.add(url);
-            }else{
-                url = url.replace(address,"127.0.0.1");
-                urls.add(url);
-            }
+            String ipAddress = getIp(address);
+
+            url = url.replace(address,ipAddress);
+            urls.add(url);
         }
         return urls;
     }