Merge branch 'eureka' into fit-eureka

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/RouteApi.java

@@ -127,24 +127,20 @@ public class RouteApi {
 
 
     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;
+        if (doSave) {
-            if (doSave) {
+            configRouteBase = new ConfigRouteBase();
-                configRouteBase = new ConfigRouteBase();
+            configRouteBase.setRouteId(routeId);
-                configRouteBase.setRouteId(routeId);
+        }
-            }
+        configRouteBase.setStatus(routeUpdateParam.getStatus().byteValue());
-            configRouteBase.setStatus(routeUpdateParam.getStatus().byteValue());
+
-
+        int i = doSave ? configRouteBaseMapper.save(configRouteBase)
-            int i = doSave ? configRouteBaseMapper.save(configRouteBase)
+                : configRouteBaseMapper.update(configRouteBase);
-                    : configRouteBaseMapper.update(configRouteBase);
+
-
+        if (i > 0) {
-            if (i > 0) {
+            this.sendMsg(configRouteBase);
-                this.sendMsg(configRouteBase);
-            }
-        } catch (Exception e) {
-            log.error("发送msg失败", e);
         }
     }
 
@@ -178,7 +174,6 @@ public class RouteApi {
                         Collectors.mapping(PermRolePermission::getRoleCode, Collectors.toList())));
 
 
-
         return permRolePermissionMapper.list(new Query().in("route_id", routeIdList))
                 .stream()
                 .map(permRolePermission -> {

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/ConfigPushService.java

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