From a002299c3e9e0313c4a7a0ce77df607884c2fac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com> Date: Wed, 19 Jun 2019 16:37:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:zap:=20=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=87=8F=E5=B0=91=20sonar=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/gateway/config/SwaggerProvider.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) 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); From 8521d9a340ad6a6ebe4df36a63d0eeabe9215bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9B=B4=E7=99=BD?= <1012042523@qq.com> Date: Thu, 20 Jun 2019 11:59:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=83=A8=E7=BD=B2=E5=90=8E=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=B5=81=E7=A8=8B=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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#");