Merge pull request #22 from codingapi/tx-lcn-foxdd

Tx lcn foxdd
codingapi · Dec 21, 2017 · 2c10b99 · 2c10b99
2 parents f9dca4e + 3ea4c04
commit 2c10b99
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/...tion-springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnLoadBalancerRule.java b/...tion-springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnLoadBalancerRule.java
@@ -35,6 +35,13 @@ public Server proxy(List<Server> servers,Server server){
 
 			String key = MD5Util.md5((groupId + "_" + appName).getBytes());
 
+			//如果只有一个可调用模块，则用当前的，且需要将数据记录到redis中
+			if(servers.size() == 1){
+				putServer(key, txTransactionLocal, server);
+				logger.info("LCNBalanceProxy -> only one server available");
+				return server;
+			}
+
 			Server oldServer =getServer(txTransactionLocal,servers,key);
 			if(oldServer != null){
 				logger.info("LCNBalanceProxy - > load old server ");

diff --git a/...gcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnZoneAwareLoadBalancerProxy.java b/...gcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnZoneAwareLoadBalancerProxy.java
@@ -5,7 +5,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,12 +25,10 @@ public LcnZoneAwareLoadBalancerProxy(IClientConfig clientConfig, IRule rule,
 	@Override
 	public Server chooseServer(Object key){
 		logger.info("enter chooseServer method, key:" + key);
-
-		List<Server> serverList = new ArrayList<Server>();
-		//获取处理之后的serverlist
-		serverList = super.getServerListImpl().getUpdatedListOfServers();
-		//获取过滤之后的serverlist
-		serverList = super.getFilter().getFilteredListOfServers(serverList);
+        List<Server> serverList = super.getReachableServers();
+        if(null == serverList || serverList.isEmpty()){
+		    return super.chooseServer(key);
+        }
 		return lcnLoadBalancerRule.proxy(serverList, super.chooseServer(key));
 
 	}

diff --git a/tx-manager/pom.xml b/tx-manager/pom.xml
@@ -120,6 +120,12 @@
                 </executions>
             </plugin>
 
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
         </plugins>
     </build>