7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-12 07:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.0

Browse Source
This commit is contained in:
tanghc
2019-08-26 17:36:23 +08:00
parent e839692da4
commit aaa5a86977
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java
View File

@@ -62,24 +62,24 @@ public class DocDiscovery {
// subscribe // subscribe
String thisServiceId = nacosDiscoveryProperties.getService(); String thisServiceId = nacosDiscoveryProperties.getService();
for (ServiceInfo serviceInfo : subscribes) { for (ServiceInfo serviceInfo : subscribes) {
String serviceName = serviceInfo.getName(); String serviceId = serviceInfo.getName();
// 如果是本机服务，跳过 // 如果是本机服务，跳过
if (Objects.equals(thisServiceId, serviceName) || "api-gateway".equalsIgnoreCase(serviceName)) { if (Objects.equals(thisServiceId, serviceId) || "api-gateway".equalsIgnoreCase(serviceId)) {
continue; continue;
} }
// nacos会不停的触发事件，这里做了一层拦截 // nacos会不停的触发事件，这里做了一层拦截
// 同一个serviceId5秒内允许访问一次 // 同一个serviceId5秒内允许访问一次
Long lastUpdateTime = updateTimeMap.getOrDefault(serviceName, 0L); Long lastUpdateTime = updateTimeMap.getOrDefault(serviceId, 0L);
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
if (now - lastUpdateTime < FIVE_SECONDS) { if (now - lastUpdateTime < FIVE_SECONDS) {
continue; continue;
} }
updateTimeMap.put(serviceName, now); updateTimeMap.put(serviceId, now);
try { try {
List<Instance> allInstances = namingService.getAllInstances(serviceName); List<Instance> allInstances = namingService.getAllInstances(serviceId);
if (CollectionUtils.isEmpty(allInstances)) { if (CollectionUtils.isEmpty(allInstances)) {
// 如果没有服务列表，则删除所有路由信息 // 如果没有服务列表，则删除所有路由信息
docManager.remove(serviceName); docManager.remove(serviceId);
} else { } else {
for (Instance instance : allInstances) { for (Instance instance : allInstances) {
String url = getRouteRequestUrl(instance); String url = getRouteRequestUrl(instance);
@@ -87,16 +87,16 @@ public class DocDiscovery {
if (responseEntity.getStatusCode() == HttpStatus.OK) { if (responseEntity.getStatusCode() == HttpStatus.OK) {
String body = responseEntity.getBody(); String body = responseEntity.getBody();
docManager.addDocInfo( docManager.addDocInfo(
serviceName serviceId
, body , body
, callback -> log.info("加载服务文档，serviceId={}, 机器={}" , callback -> log.info("加载服务文档，serviceId={}, 机器={}"
, serviceName, instance.getIp() + ":" + instance.getPort()) , serviceId, instance.getIp() + ":" + instance.getPort())
); );
} }
} }
} }
} catch (NacosException e) { } catch (NacosException e) {
log.error("选择服务实例失败，serviceName:{}", serviceName, e); log.error("选择服务实例失败，serviceId:{}", serviceId, e);
} }
} }
} }