Skip to content

Commit 2c10b99

Browse files
authored
Merge pull request #22 from codingapi/tx-lcn-foxdd
Tx lcn foxdd
2 parents f9dca4e + 3ea4c04 commit 2c10b99

3 files changed

Lines changed: 17 additions & 7 deletions

File tree

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ public Server proxy(List<Server> servers,Server server){
3535

3636
String key = MD5Util.md5((groupId + "_" + appName).getBytes());
3737

38+
//如果只有一个可调用模块,则用当前的,且需要将数据记录到redis中
39+
if(servers.size() == 1){
40+
putServer(key, txTransactionLocal, server);
41+
logger.info("LCNBalanceProxy -> only one server available");
42+
return server;
43+
}
44+
3845
Server oldServer =getServer(txTransactionLocal,servers,key);
3946
if(oldServer != null){
4047
logger.info("LCNBalanceProxy - > load old server ");

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
77

8-
import java.util.ArrayList;
98
import java.util.List;
109

1110
/**
@@ -26,12 +25,10 @@ public LcnZoneAwareLoadBalancerProxy(IClientConfig clientConfig, IRule rule,
2625
@Override
2726
public Server chooseServer(Object key){
2827
logger.info("enter chooseServer method, key:" + key);
29-
30-
List<Server> serverList = new ArrayList<Server>();
31-
//获取处理之后的serverlist
32-
serverList = super.getServerListImpl().getUpdatedListOfServers();
33-
//获取过滤之后的serverlist
34-
serverList = super.getFilter().getFilteredListOfServers(serverList);
28+
List<Server> serverList = super.getReachableServers();
29+
if(null == serverList || serverList.isEmpty()){
30+
return super.chooseServer(key);
31+
}
3532
return lcnLoadBalancerRule.proxy(serverList, super.chooseServer(key));
3633

3734
}

tx-manager/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@
120120
</executions>
121121
</plugin>
122122

123+
124+
<plugin>
125+
<groupId>org.springframework.boot</groupId>
126+
<artifactId>spring-boot-maven-plugin</artifactId>
127+
</plugin>
128+
123129
</plugins>
124130
</build>
125131

0 commit comments

Comments
 (0)