From e05e782fce595c644abe6cf14f8d249a40380adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 3 Dec 2018 17:08:41 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 16 ++++------------ .../pigx/gateway/config/SwaggerProvider.java | 5 ++++- pigx-visual/pigx-activiti/pom.xml | 5 +++++ .../pigx/act/PigxActivitiApplication.java | 2 ++ .../src/main/resources/template/index.vue.vm | 6 +++--- pigx-visual/pigx-daemon/pom.xml | 5 +++++ .../pigx/daemon/PigxDaemonApplication.java | 4 +++- 7 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.editorconfig b/.editorconfig index c4ed6ac9a..3e1127a6d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,18 +1,10 @@ root = true -# 对所有文件生效 -[*] +[*.{adoc,bat,groovy,html,java,js,jsp,kt,kts,md,properties,py,rb,sh,sql,svg,txt,xml,xsd}] charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true -[*.{java,xml}] +[*.{groovy,java,kt,kts,xml,xsd}] indent_style = tab indent_size = 4 - -# 对后缀名为 md 的文件生效 -[*.md] -trim_trailing_whitespace = false +continuation_indent_size = 8 +end_of_line = lf 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 dc8f84b4f..0fc64caf7 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 @@ -27,7 +27,9 @@ import springfox.documentation.swagger.web.SwaggerResource; import springfox.documentation.swagger.web.SwaggerResourcesProvider; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; /** * @author Sywd @@ -54,7 +56,8 @@ public class SwaggerProvider implements SwaggerResourcesProvider { predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0") .replace("/**", API_URI))))); - return resources; + return resources.stream().sorted(Comparator.comparing(SwaggerResource::getName)) + .collect(Collectors.toList()); } private SwaggerResource swaggerResource(String name, String location) { diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml index ef73fadb7..4a405a99b 100644 --- a/pigx-visual/pigx-activiti/pom.xml +++ b/pigx-visual/pigx-activiti/pom.xml @@ -48,6 +48,11 @@ pigx-upms-api 1.8.0 + + com.pig4cloud + pigx-common-swagger + 1.8.0 + mysql mysql-connector-java diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java index 6ecd5cb77..17977746f 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.act; import com.pig4cloud.pigx.common.security.annotation.EnablePigxFeignClients; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; +import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.cloud.client.SpringCloudApplication; @@ -27,6 +28,7 @@ import org.springframework.cloud.client.SpringCloudApplication; * @date 2018/9/25 * 工作流管理模块 */ +@EnablePigxSwagger2 @EnablePigxFeignClients @EnablePigxResourceServer @SpringCloudApplication diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm index 48db2a224..47b781c9c 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm @@ -16,7 +16,7 @@ -->