diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java index f564a8348..159ab0420 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java @@ -39,28 +39,24 @@ import java.util.stream.Collectors; @Primary @AllArgsConstructor public class SwaggerProvider implements SwaggerResourcesProvider { - public static final String API_URI = "/v2/api-docs"; + private static final String API_URI = "/v2/api-docs"; private final RouteDefinitionRepository routeDefinitionRepository; private final FilterIgnorePropertiesConfig filterIgnorePropertiesConfig; - @Override public List get() { - List resources = new ArrayList<>(); List routes = new ArrayList<>(); - routeDefinitionRepository.getRouteDefinitions().subscribe(route -> routes.add(route)); - routes.forEach(routeDefinition -> routeDefinition.getPredicates().stream() + routeDefinitionRepository.getRouteDefinitions().subscribe(routes::add); + return routes.stream().flatMap(routeDefinition -> routeDefinition.getPredicates().stream() .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName())) .filter(predicateDefinition -> !filterIgnorePropertiesConfig.getSwaggerProviders().contains(routeDefinition.getId())) - .forEach(predicateDefinition -> resources.add(swaggerResource(routeDefinition.getId(), - predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0") - .replace("/**", API_URI))))); - - return resources.stream().sorted(Comparator.comparing(SwaggerResource::getName)) + .map(predicateDefinition -> + swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", API_URI)) + )).sorted(Comparator.comparing(SwaggerResource::getName)) .collect(Collectors.toList()); } - private SwaggerResource swaggerResource(String name, String location) { + private static SwaggerResource swaggerResource(String name, String location) { SwaggerResource swaggerResource = new SwaggerResource(); swaggerResource.setName(name); swaggerResource.setLocation(location); diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java index f358ebca8..ccecdefeb 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java @@ -72,6 +72,8 @@ public class ModelServiceImpl implements ModelService { editorNode.put("resourceId", "canvas"); ObjectNode properties = objectMapper.createObjectNode(); properties.put("process_author", SecurityConstants.PIGX_LICENSE); + properties.put("process_id",key); + properties.put("name",name); editorNode.set("properties", properties); ObjectNode stencilset = objectMapper.createObjectNode(); stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");