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

Tx lcn foxdd

Author: xlorne

transaction-springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnLoadBalancerRule.java

@@ -1,5 +1,8 @@
 package com.codingapi.ribbon.loadbalancer;
 
+
+import com.alibaba.fastjson.JSONObject;
+
 import com.codingapi.tx.aop.bean.TxTransactionLocal;
 import com.lorne.core.framework.utils.encode.MD5Util;
 import com.netflix.loadbalancer.Server;

transaction-springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnNoOpLoadBalancerProxy.java

@@ -6,6 +6,9 @@
 import com.netflix.loadbalancer.NoOpLoadBalancer;
 import com.netflix.loadbalancer.Server;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * created by foxdd 2017-12-05
  */
@@ -22,7 +25,10 @@ public LcnNoOpLoadBalancerProxy(){
 	@Override
 	public Server chooseServer(Object key){
 		logger.info("enter chooseServer method, key:" + key);
-		return lcnLoadBalancerRule.proxy(getAllServers(),super.chooseServer(key));
+
+		List<Server> serverList = new ArrayList<Server>();
+		return lcnLoadBalancerRule.proxy(serverList, super.chooseServer(key));
+
 	}
 
 }

transaction-springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnRibbonConfiguration.java

@@ -29,7 +29,7 @@ public class LcnRibbonConfiguration {
 	public ILoadBalancer ribbonLoadBalancer(IClientConfig config,
 			ServerList<Server> serverList, ServerListFilter<Server> serverListFilter,
 			IRule rule, IPing ping, ServerListUpdater serverListUpdater) {
-		return new LcnZoneAwareLoadBalancerProxy<>(config, rule, ping, serverList,
+		return new LcnZoneAwareLoadBalancerProxy(config, rule, ping, serverList,
 				serverListFilter, serverListUpdater);
 	}
 

transaction-springcloud/src/main/java/com/codingapi/ribbon/loadbalancer/LcnZoneAwareLoadBalancerProxy.java

@@ -1,36 +1,39 @@
 package com.codingapi.ribbon.loadbalancer;
 
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.IPing;
-import com.netflix.loadbalancer.IRule;
-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
-import com.netflix.loadbalancer.ServerListFilter;
-import com.netflix.loadbalancer.ServerListUpdater;
-import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * created by foxdd 2017-12-05
  */
-public class LcnZoneAwareLoadBalancerProxy<T extends Server> extends ZoneAwareLoadBalancer<T> {
+public class LcnZoneAwareLoadBalancerProxy extends ZoneAwareLoadBalancer<Server> {
 
 	private Logger logger = LoggerFactory.getLogger(LcnZoneAwareLoadBalancerProxy.class);
 
 	LcnLoadBalancerRule lcnLoadBalancerRule = new LcnLoadBalancerRule();
 
 	public LcnZoneAwareLoadBalancerProxy(IClientConfig clientConfig, IRule rule,
-            IPing ping, ServerList<T> serverList, ServerListFilter<T> filter,
+            IPing ping, ServerList<Server> serverList, ServerListFilter<Server> filter,
             ServerListUpdater serverListUpdater) {
 		super(clientConfig, rule, ping, serverList, filter, serverListUpdater);
 	}
 
 	@Override
 	public Server chooseServer(Object key){
 		logger.info("enter chooseServer method, key:" + key);
-		return lcnLoadBalancerRule.proxy(getAllServers(),super.chooseServer(key));
+
+		List<Server> serverList = new ArrayList<Server>();
+		//获取处理之后的serverlist
+		serverList = super.getServerListImpl().getUpdatedListOfServers();
+		//获取过滤之后的serverlist
+		serverList = super.getFilter().getFilteredListOfServers(serverList);
+		return lcnLoadBalancerRule.proxy(serverList, super.chooseServer(key));
+
 	}
 
 }