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 @@
 			<artifactId>pigx-upms-api</artifactId>
 			<version>1.8.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-swagger</artifactId>
+			<version>1.8.0</version>
+		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
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 @@
   -->
 
 <template>
-  <div class="app-container pull-auto">
+  <div class="execution">
     <basic-container>
       <avue-crud ref="crud"
                  :page="page"
@@ -86,8 +86,8 @@
           page: page.currentPage,
           limit: page.pageSize
         }, params)).then(response => {
-          this.tableData = response.data.records
-          this.page.total = response.data.total
+          this.tableData = response.data.data.records
+          this.page.total = response.data.data.total
           this.tableLoading = false
         })
       },
diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml
index 870c7c8bf..84980f785 100644
--- a/pigx-visual/pigx-daemon/pom.xml
+++ b/pigx-visual/pigx-daemon/pom.xml
@@ -43,6 +43,11 @@
 			<artifactId>pigx-common-job</artifactId>
 			<version>1.8.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-swagger</artifactId>
+			<version>1.8.0</version>
+		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonApplication.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonApplication.java
index a9f6a441c..9a272f5ed 100644
--- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonApplication.java
+++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonApplication.java
@@ -18,8 +18,9 @@
 package com.pig4cloud.pigx.daemon;
 
 import com.pig4cloud.pigx.common.job.annotation.EnablePigxJob;
-import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
 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;
 
@@ -29,6 +30,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  * 分布式任务调度模块
  */
 @EnablePigxJob
+@EnablePigxSwagger2
 @EnablePigxFeignClients
 @SpringCloudApplication
 @EnablePigxResourceServer