7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

4.3.3

Browse Source
This commit is contained in:
tanghc
2021-03-30 09:46:39 +08:00
parent 8543754888
commit 7ec542abce
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.md
View File

@@ -1,5 +1,9 @@
# changelog # changelog
## 4.3.3
- 修复获取eureka地址问题
## 4.3.2 ## 4.3.2
- 修复微服务方法获取不到OpenContext问题 - 修复微服务方法获取不到OpenContext问题

26
sop-website/sop-website-server/src/main/java/com/gitee/sop/websiteserver/service/impl/EurekaServerService.java
View File

@@ -12,12 +12,14 @@ import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* @author tanghc * @author tanghc
@@ -28,11 +30,11 @@ public class EurekaServerService implements ServerService {
private OkHttpClient client = new OkHttpClient(); private OkHttpClient client = new OkHttpClient();
@Value("${eureka.client.serviceUrl.defaultZone:}") @Value("${eureka.client.serviceUrl.defaultZone:}")
private String eurekaUrl; private String eurekaUrls;
@Override @Override
public List<String> listServerHost(String serviceId) { public List<String> listServerHost(String serviceId) {
if (StringUtils.isBlank(eurekaUrl)) { if (StringUtils.isBlank(eurekaUrls)) {
throw new IllegalArgumentException("未指定eureka.client.serviceUrl.defaultZone参数"); throw new IllegalArgumentException("未指定eureka.client.serviceUrl.defaultZone参数");
} }
Objects.requireNonNull(serviceId, "serviceId can not be null"); Objects.requireNonNull(serviceId, "serviceId can not be null");
@@ -58,7 +60,7 @@ public class EurekaServerService implements ServerService {
} }
private String requestEurekaServer(EurekaUri eurekaUri, String... args) throws IOException { private String requestEurekaServer(EurekaUri eurekaUri, String... args) throws IOException {
Request request = eurekaUri.getRequest(this.eurekaUrl, args); Request request = eurekaUri.getRequest(this.getFirstDefaultZoneServiceUrl(), args);
Response response = client.newCall(request).execute(); Response response = client.newCall(request).execute();
if (response.isSuccessful()) { if (response.isSuccessful()) {
return response.body().string(); return response.body().string();
@@ -67,4 +69,22 @@ public class EurekaServerService implements ServerService {
throw new RuntimeException("操作失败"); throw new RuntimeException("操作失败");
} }
} }
private List<String> getDefaultZoneServiceUrls() {
if (!StringUtils.isEmpty(eurekaUrls)) {
return Stream.of(org.springframework.util.StringUtils.commaDelimitedListToStringArray(eurekaUrls))
.map(url -> !url.endsWith("/") ? (url += "/").trim() : url.trim())
.collect(Collectors.toList());
} else {
return Collections.emptyList();
}
}
private String getFirstDefaultZoneServiceUrl() {
List<String> serviceUrls = getDefaultZoneServiceUrls();
if (CollectionUtils.isEmpty(serviceUrls)) {
throw new IllegalArgumentException("未指定eureka.client.serviceUrl.defaultZone参数");
}
return serviceUrls.get(0);
}
} }