适配eureka

pull/1/head
tanghc 5 years ago
parent ebae593ab6
commit 3e506b27ef
  1. 5
      sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/RouteApi.java
  2. 1
      sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/ConfigPushService.java

@ -127,7 +127,6 @@ public class RouteApi {
private void updateRouteConfig(RouteUpdateParam routeUpdateParam) { private void updateRouteConfig(RouteUpdateParam routeUpdateParam) {
try {
String routeId = routeUpdateParam.getId(); String routeId = routeUpdateParam.getId();
ConfigRouteBase configRouteBase = configRouteBaseMapper.getByColumn("route_id", routeId); ConfigRouteBase configRouteBase = configRouteBaseMapper.getByColumn("route_id", routeId);
boolean doSave = configRouteBase == null; boolean doSave = configRouteBase == null;
@ -143,9 +142,6 @@ public class RouteApi {
if (i > 0) { if (i > 0) {
this.sendMsg(configRouteBase); this.sendMsg(configRouteBase);
} }
} catch (Exception e) {
log.error("发送msg失败", e);
}
} }
private void sendMsg(ConfigRouteBase routeDefinition) { private void sendMsg(ConfigRouteBase routeDefinition) {
@ -178,7 +174,6 @@ public class RouteApi {
Collectors.mapping(PermRolePermission::getRoleCode, Collectors.toList()))); Collectors.mapping(PermRolePermission::getRoleCode, Collectors.toList())));
return permRolePermissionMapper.list(new Query().in("route_id", routeIdList)) return permRolePermissionMapper.list(new Query().in("route_id", routeIdList))
.stream() .stream()
.map(permRolePermission -> { .map(permRolePermission -> {

@ -50,6 +50,7 @@ public class ConfigPushService {
List<ServiceInstanceVO> serviceInstanceList = serverService.listService(serviceSearchParam); List<ServiceInstanceVO> serviceInstanceList = serverService.listService(serviceSearchParam);
Collection<String> hostList = serviceInstanceList Collection<String> hostList = serviceInstanceList
.stream() .stream()
.filter(serviceInstanceVO -> StringUtils.isNotBlank(serviceInstanceVO.getInstanceId()))
.map(ServiceInstanceVO::getIpPort) .map(ServiceInstanceVO::getIpPort)
.collect(Collectors.toList()); .collect(Collectors.toList());
this.pushByHost(hostList, gatewayPushDTO); this.pushByHost(hostList, gatewayPushDTO);

Loading…
Cancel
Save