From 9f10b3fa1b49d0f3fc499040e1e5fa67ee1a2b1a Mon Sep 17 00:00:00 2001
From: herodotus
Date: Sun, 12 Sep 2021 03:06:13 +0800
Subject: [PATCH] feat: v2.5.4.120
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1. 使用Springdoc全面替换Springfox,配置更灵活、配置更多样
2. Swagger文档注解全面升级为支持OpenAPI
3. 使用Springdoc重构文档聚合功能,支持聚合查阅和服务独立查阅。Knife4j同步升级至3.0.3版本。
4. Swagger文档默认支持OAuth2 Password、Authorization Code 两种认证流程
5. 整合Camunda Engine Rest 与Swagger,实现Camunda API接口文档查阅,支持聚合查阅。
6. 修复Bpmn服务默认启动Tomcat问题。
7. 升级前端依赖包版本
8. 更新Nacos配置文件及导入包
9. 更新在线文档
---
README.md | 2 +-
.../docker/docker-compose/herodotus/.env | 2 +-
dependencies/pom.xml | 43 +-
documents/guides/404.html | 4 +-
.../js/{app.a36212f7.js => app.7de48254.js} | 2 +-
.../guides/assets/js/runtime~app.70302f05.js | 1 -
.../guides/assets/js/runtime~app.a4249523.js | 1 +
.../guides/assets/js/v-25b47c13.4f67a7d2.js | 1 +
.../guides/assets/js/v-25b47c13.5aec5b68.js | 1 -
.../guides/assets/js/v-5b482e3b.0363b26d.js | 1 +
.../guides/assets/js/v-5b482e3b.99758c97.js | 1 -
.../guides/assets/js/v-c0f957a0.38e49d70.js | 1 +
.../guides/assets/js/v-c0f957a0.93f13f72.js | 1 -
documents/guides/basic-knowledge/index.html | 4 +-
.../basic-knowledge/spring-data-jpa.html | 4 +-
documents/guides/documents-athena/index.html | 4 +-
documents/guides/documents/index.html | 6 +-
...\347\253\257\346\211\213\345\206\214.html" | 4 +-
...\345\242\203\351\205\215\347\275\256.html" | 4 +-
...\351\200\237\344\272\206\350\247\243.html" | 4 +-
...\345\210\235\345\247\213\345\214\226.html" | 4 +-
...\345\255\220\346\250\241\345\235\227.html" | 4 +-
...\346\225\260\346\215\256\345\272\223.html" | 4 +-
...\345\242\203\351\203\250\347\275\262.html" | 4 +-
...\347\233\256\344\273\213\347\273\215.html" | 4 +-
documents/guides/index.html | 4 +-
documents/guides/microservices/index.html | 4 +-
...\345\214\226\346\212\200\346\234\257.html" | 4 +-
...\345\214\226\351\203\250\347\275\262.html" | 4 +-
documents/guides/others/index.html | 6 +-
...\346\226\260\346\227\245\345\277\227.html" | 6 +-
packages/eurynome-cloud-assistant/pom.xml | 2 +-
packages/eurynome-cloud-common/pom.xml | 26 +-
.../common/constant/enums/AccountType.java | 11 +-
.../constant/enums/ApplicationType.java | 11 +-
.../common/constant/enums/AuthorityType.java | 11 +-
.../constant/enums/OAuth2Expression.java | 10 +-
.../common/constant/enums/ResultStatus.java | 9 +-
.../common/constant/enums/StatusEnum.java | 23 +-
.../constant/magic/SecurityConstants.java | 2 +
.../definition/entity/AbstractEntity.java | 7 +-
.../common/definition/entity/Entity.java | 6 +-
.../eurynome/common/domain/Error.java | 13 +-
.../eurynome/common/domain/Result.java | 21 +-
packages/eurynome-cloud-data/pom.xml | 4 +-
.../eurynome/data/base/entity/BaseEntity.java | 10 +-
.../data/base/entity/BaseSysEntity.java | 10 +-
packages/eurynome-cloud-kernel/pom.xml | 4 +-
packages/eurynome-cloud-oauth-starter/pom.xml | 4 +-
packages/eurynome-cloud-oauth/pom.xml | 4 +-
.../oauth/controller/IdentityController.java | 8 +-
packages/eurynome-cloud-rest/pom.xml | 15 +-
.../eurynome/rest/base/business/Pager.java | 8 +-
.../BaseReadableRestController.java | 16 +-
.../BaseWriteableRestController.java | 18 +-
.../configuration/OpenAPIConfiguration.java | 105 +
.../rest/configuration/RestConfiguration.java | 2 +-
.../configuration/SwaggerConfiguration.java | 141 -
packages/eurynome-cloud-security/pom.xml | 14 +-
.../access/RequestMappingScanner.java | 15 +-
.../WebMvcAutoConfiguration.java | 8 +-
packages/eurynome-cloud-starter/pom.xml | 4 +-
packages/pom.xml | 2 +-
platform/eurynome-cloud-gateway/pom.xml | 12 +-
.../configuration/SwaggerProvider.java | 97 -
.../gateway/controller/SwaggerHandler.java | 72 -
.../handler/RefreshRoutesListener.java | 105 +
.../src/main/resources/bootstrap.yml | 19 +-
platform/eurynome-cloud-management/pom.xml | 4 +-
.../configs/common/eurynome-cloud-rest.yaml | 13 +
.../nacos_config_export_20210912022300.zip | Bin 0 -> 6096 bytes
.../nacos_config_export_20210912022310.zip | Bin 0 -> 2866 bytes
platform/eurynome-cloud-uaa/pom.xml | 9 +-
.../src/main/resources/bootstrap.yml | 11 +-
platform/pom.xml | 2 +-
pom.xml | 37 +-
services/eurynome-cloud-bpmn-ability/pom.xml | 10 +-
.../resources/META-INF/resources/openapi.json | 33278 ++++++++++++++++
.../src/main/resources/bootstrap.yml | 15 +-
services/eurynome-cloud-bpmn-rest/pom.xml | 4 +-
.../eurynome/bpmn/rest/entity/ActIdGroup.java | 13 +-
.../bpmn/rest/entity/ActIdMembership.java | 4 +-
.../bpmn/rest/entity/ActIdTenant.java | 7 +-
.../bpmn/rest/entity/ActIdTenantMember.java | 7 +-
.../eurynome/bpmn/rest/entity/ActIdUser.java | 21 +-
services/eurynome-cloud-upms-ability/pom.xml | 4 +-
.../src/main/resources/bootstrap.yml | 10 +-
services/eurynome-cloud-upms-api/pom.xml | 4 +-
.../upms/api/constants/enums/Gender.java | 11 +-
.../upms/api/constants/enums/Identity.java | 11 +-
.../api/constants/enums/SupplierType.java | 11 +-
.../api/constants/enums/TechnologyType.java | 11 +-
.../api/entity/system/SysDefaultRole.java | 8 +-
.../upms/api/entity/system/SysUser.java | 17 +-
services/eurynome-cloud-upms-logic/pom.xml | 4 +-
services/eurynome-cloud-upms-rest/pom.xml | 4 +-
.../controller/UpmsConstantsController.java | 6 +-
.../development/SupplierController.java | 8 +-
.../oauth/OauthApplicationsController.java | 18 +-
.../oauth/OauthClientDetailsController.java | 32 +-
.../oauth/OauthScopesController.java | 18 +-
.../system/SysAuthorityController.java | 12 +-
.../controller/system/SysRoleController.java | 18 +-
.../controller/system/SysUserController.java | 18 +-
services/pom.xml | 2 +-
105 files changed, 33911 insertions(+), 739 deletions(-)
rename documents/guides/assets/js/{app.a36212f7.js => app.7de48254.js} (79%)
delete mode 100644 documents/guides/assets/js/runtime~app.70302f05.js
create mode 100644 documents/guides/assets/js/runtime~app.a4249523.js
create mode 100644 documents/guides/assets/js/v-25b47c13.4f67a7d2.js
delete mode 100644 documents/guides/assets/js/v-25b47c13.5aec5b68.js
create mode 100644 documents/guides/assets/js/v-5b482e3b.0363b26d.js
delete mode 100644 documents/guides/assets/js/v-5b482e3b.99758c97.js
create mode 100644 documents/guides/assets/js/v-c0f957a0.38e49d70.js
delete mode 100644 documents/guides/assets/js/v-c0f957a0.93f13f72.js
create mode 100644 packages/eurynome-cloud-rest/src/main/java/cn/herodotus/eurynome/rest/configuration/OpenAPIConfiguration.java
delete mode 100644 packages/eurynome-cloud-rest/src/main/java/cn/herodotus/eurynome/rest/configuration/SwaggerConfiguration.java
delete mode 100644 platform/eurynome-cloud-gateway/src/main/java/cn/herodotus/eurynome/gateway/configuration/SwaggerProvider.java
delete mode 100644 platform/eurynome-cloud-gateway/src/main/java/cn/herodotus/eurynome/gateway/controller/SwaggerHandler.java
create mode 100644 platform/eurynome-cloud-gateway/src/main/java/cn/herodotus/eurynome/gateway/handler/RefreshRoutesListener.java
create mode 100644 platform/eurynome-cloud-management/src/main/resources/imports/v2.5.4.120/nacos_config_export_20210912022300.zip
create mode 100644 platform/eurynome-cloud-management/src/main/resources/imports/v2.5.4.120/nacos_config_export_20210912022310.zip
create mode 100644 services/eurynome-cloud-bpmn-ability/src/main/resources/META-INF/resources/openapi.json
diff --git a/README.md b/README.md
index a818906eb..dc0876c66 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
-
+
diff --git a/configurations/docker/docker-compose/herodotus/.env b/configurations/docker/docker-compose/herodotus/.env
index 6a4fc07dd..b8e3d7846 100644
--- a/configurations/docker/docker-compose/herodotus/.env
+++ b/configurations/docker/docker-compose/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.5.4.110
+VERSION=2.5.4.120
GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
GATEWAY_SERVICE_PORT=8847
UAA_SERVICE_NAME=eurynome-cloud-uaa
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 75d90e4ae..82c6b3469 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -35,7 +35,7 @@
cn.herodotus.eurynome
dependencies
- 2.5.4.110
+ 2.5.4.120
pom
eurynome-cloud-dependencies
@@ -80,8 +80,7 @@
1.18.20
3.9.1
- 2.9.2
- 1.6.2
+ 1.5.10
6.6
@@ -93,7 +92,7 @@
5.7.10
3.1.4
1.16.3
- 2.0.6
+ 3.0.3
2.3.2
1.6.2
@@ -289,27 +288,29 @@
${lombok.version}
provided
+
- io.springfox
- springfox-swagger2
- ${springfox.version}
+ org.springdoc
+ springdoc-openapi-common
+ ${springdoc.version}
+
- io.springfox
- springfox-swagger-ui
- ${springfox.version}
+ org.springdoc
+ springdoc-openapi-ui
+ ${springdoc.version}
-
+
- io.swagger
- swagger-annotations
- ${swagger.version}
+ org.springdoc
+ springdoc-openapi-webflux-ui
+ ${springdoc.version}
-
+
- io.swagger
- swagger-models
- ${swagger.version}
+ org.springdoc
+ springdoc-openapi-security
+ ${springdoc.version}
@@ -373,10 +374,10 @@
JustAuth
${just-auth.verison}
-
+
com.github.xiaoymin
- knife4j-spring-ui
+ knife4j-springdoc-ui
${knife4j.version}
@@ -505,7 +506,7 @@
yyyy-MM-dd HH:mm:ss
-
+
false
diff --git a/documents/guides/404.html b/documents/guides/404.html
index ffa41d748..615768f0c 100644
--- a/documents/guides/404.html
+++ b/documents/guides/404.html
@@ -5,11 +5,11 @@
Eurynome Cloud
-
+
-
+