diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 72877f93ef..75404b56cb 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -15,21 +15,20 @@ 2.6.0-SNAPSHOT - 1.6.0 + 1.7.0 3.5.0 - - 2.8.8 - 4.6.0 + 2.8.9 1.2.25 + 3.5.19 3.5.12 4.3.1 1.4.13 3.0.6 - 3.48.0 + 3.49.0 8.1.3.140 8.6.0 5.1.0 @@ -60,23 +59,21 @@ 1.2.83 33.4.8-jre 2.14.5 - 3.11.1 - 0.1.55 3.2.0 2.7.0 3.0.6 - 4.2.1.Final + 4.2.2.Final 1.2.5 0.9.0 4.5.13 2.19.0 1.27.1 - 2.30.14 + 2.31.60 1.16.7 1.4.0 1.9.4 - 4.7.5-20250529.111829 + 4.7.6-20250609.143003 @@ -152,11 +149,6 @@ ${revision} - - com.github.xingfudeshi - knife4j-openapi3-jakarta-spring-boot-starter - ${knife4j.version} - org.springdoc springdoc-openapi-starter-webmvc-api @@ -524,18 +516,6 @@ ${transmittable-thread-local.version} - - commons-net - commons-net - ${commons-net.version} - - - - com.jcraft - jsch - ${jsch.version} - - com.anji-plus captcha-spring-boot-starter diff --git a/yudao-framework/yudao-spring-boot-starter-web/pom.xml b/yudao-framework/yudao-spring-boot-starter-web/pom.xml index d04db57c47..2e79cfb0ac 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-web/pom.xml @@ -38,10 +38,6 @@ provided - - com.github.xingfudeshi - knife4j-openapi3-jakarta-spring-boot-starter - org.springdoc springdoc-openapi-starter-webmvc-api diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SwaggerProperties.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SpringDocProperties.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SwaggerProperties.java rename to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SpringDocProperties.java index 5374d3aca2..3f04d07400 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SwaggerProperties.java +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SpringDocProperties.java @@ -10,9 +10,9 @@ import jakarta.validation.constraints.NotEmpty; * * @author 芋道源码 */ -@ConfigurationProperties("yudao.swagger") +@ConfigurationProperties("springdoc.configs") @Data -public class SwaggerProperties { +public class SpringDocProperties { /** * 标题 diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSpringDocAutoConfiguration.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java rename to yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSpringDocAutoConfiguration.java index 295e3238ff..98198c97b7 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSpringDocAutoConfiguration.java @@ -44,14 +44,14 @@ import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_ */ @AutoConfiguration @ConditionalOnClass({OpenAPI.class}) -@EnableConfigurationProperties(SwaggerProperties.class) +@EnableConfigurationProperties(SpringDocProperties.class) @ConditionalOnProperty(prefix = "springdoc.api-docs", name = "enabled", havingValue = "true", matchIfMissing = true) // 设置为 false 时，禁用 -public class YudaoSwaggerAutoConfiguration { +public class YudaoSpringDocAutoConfiguration { // ========== 全局 OpenAPI 配置 ========== @Bean - public OpenAPI createApi(SwaggerProperties properties) { + public OpenAPI createApi(SpringDocProperties properties) { Map securitySchemas = buildSecuritySchemes(); OpenAPI openAPI = new OpenAPI() // 接口信息 @@ -66,7 +66,7 @@ public class YudaoSwaggerAutoConfiguration { /** * API 摘要信息 */ - private Info buildInfo(SwaggerProperties properties) { + private Info buildInfo(SpringDocProperties properties) { return new Info() .title(properties.getTitle()) .description(properties.getDescription()) @@ -144,8 +144,6 @@ public class YudaoSwaggerAutoConfiguration { /** * 构建 Authorization 认证请求头参数 * - * 解决 Knife4j Authorize 未生效，请求header里未包含参数 - * * @return 认证参数 */ private static Parameter buildSecurityHeaderParameter() { diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/package-info.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/package-info.java index 5eb7822720..8b3e06d384 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/package-info.java +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/package-info.java @@ -1,5 +1,5 @@ /** - * 基于 Swagger + Knife4j 实现 API 接口文档 + * 基于 spring dod 实现 API 接口文档 * * @author 芋道源码 */ diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 9cdcd09c4e..ced107fd4b 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,6 +1,6 @@ cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration -cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration +cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration cn.iocoder.yudao.framework.xss.config.YudaoXssAutoConfiguration -cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration \ No newline at end of file +cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/web/config/AiWebConfiguration.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/web/config/AiWebConfiguration.java index 2eb265d588..0b3578ed7d 100644 --- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/web/config/AiWebConfiguration.java +++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/web/config/AiWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.ai.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class AiWebConfiguration { */ @Bean public GroupedOpenApi aiGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("ai"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("ai"); } } diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/config/BpmWebConfiguration.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/config/BpmWebConfiguration.java index d4af61c9bf..baf41d754f 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/config/BpmWebConfiguration.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/config/BpmWebConfiguration.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.bpm.framework.web.config; import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import cn.iocoder.yudao.module.bpm.framework.web.core.FlowableWebFilter; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -21,7 +21,7 @@ public class BpmWebConfiguration { */ @Bean public GroupedOpenApi bpmGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("bpm"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("bpm"); } /** diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/web/config/CrmWebConfiguration.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/web/config/CrmWebConfiguration.java index 5b68d8e2ee..40dbeb4c22 100644 --- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/web/config/CrmWebConfiguration.java +++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/web/config/CrmWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.crm.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class CrmWebConfiguration { */ @Bean public GroupedOpenApi crmGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("crm"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("crm"); } } diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java index 4a2bc7fa37..52c10dc052 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.erp.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class ErpWebConfiguration { */ @Bean public GroupedOpenApi erpGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("erp"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("erp"); } } diff --git a/yudao-module-infra/pom.xml b/yudao-module-infra/pom.xml index 8b983cfe4b..7fa6370ae2 100644 --- a/yudao-module-infra/pom.xml +++ b/yudao-module-infra/pom.xml @@ -94,15 +94,6 @@ spring-boot-admin-starter-server - - - commons-net - commons-net - - - com.jcraft - jsch - software.amazon.awssdk diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/web/config/InfraWebConfiguration.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/web/config/InfraWebConfiguration.java index 7ab1e9ea31..94e2a71173 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/web/config/InfraWebConfiguration.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/web/config/InfraWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.infra.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class InfraWebConfiguration { */ @Bean public GroupedOpenApi infraGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("infra"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("infra"); } } diff --git a/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java b/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java index 7da179960b..d62dde69df 100644 --- a/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java +++ b/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.product.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class ProductWebConfiguration { */ @Bean public GroupedOpenApi productGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("product"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("product"); } } diff --git a/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/config/PromotionWebConfiguration.java b/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/config/PromotionWebConfiguration.java index b94a69dbe8..725df33641 100644 --- a/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/config/PromotionWebConfiguration.java +++ b/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/config/PromotionWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.promotion.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class PromotionWebConfiguration { */ @Bean public GroupedOpenApi promotionGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("promotion"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("promotion"); } } diff --git a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java index 837fc5b3a3..f07366242d 100644 --- a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java +++ b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.trade.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class TradeWebConfiguration { */ @Bean public GroupedOpenApi tradeGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("trade"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("trade"); } } diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/framework/web/config/MemberWebConfiguration.java b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/framework/web/config/MemberWebConfiguration.java index 5e3dc3f376..9112c2a43c 100644 --- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/framework/web/config/MemberWebConfiguration.java +++ b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/framework/web/config/MemberWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.member.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class MemberWebConfiguration { */ @Bean public GroupedOpenApi memberGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("member"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("member"); } } diff --git a/yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/framework/web/config/MpWebConfiguration.java b/yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/framework/web/config/MpWebConfiguration.java index 75a236289e..4ecbd3e129 100644 --- a/yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/framework/web/config/MpWebConfiguration.java +++ b/yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/framework/web/config/MpWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.mp.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class MpWebConfiguration { */ @Bean public GroupedOpenApi mpGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("mp"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("mp"); } } diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/web/config/PayWebConfiguration.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/web/config/PayWebConfiguration.java index 4a9dbb4d17..51d5c6dd0d 100644 --- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/web/config/PayWebConfiguration.java +++ b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/web/config/PayWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.pay.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class PayWebConfiguration { */ @Bean public GroupedOpenApi payGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("pay"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("pay"); } } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/framework/web/config/SystemWebConfiguration.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/framework/web/config/SystemWebConfiguration.java index 9e6d662354..9d692f9306 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/framework/web/config/SystemWebConfiguration.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/framework/web/config/SystemWebConfiguration.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.system.framework.web.config; -import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.framework.swagger.config.YudaoSpringDocAutoConfiguration; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class SystemWebConfiguration { */ @Bean public GroupedOpenApi systemGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("system"); + return YudaoSpringDocAutoConfiguration.buildGroupedOpenApi("system"); } } diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 37b783d57d..a391d0bc84 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -42,15 +42,17 @@ springdoc: api-docs: enabled: true path: /v3/api-docs + configs: + title: 芋道快速开发平台 + description: 提供管理后台、用户 App 的所有功能 + version: ${yudao.info.version} + url: ${yudao.web.admin-ui.url} + email: xingyu4j@vip.qq.com + license: MIT + license-url: https://gitee.com/zhijiantianya/ruoyi-vue-pro/blob/master/LICENSE swagger-ui: - enabled: true + enabled: false path: /swagger-ui - default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档 - -knife4j: - enable: false # TODO 芋艿：需要关闭增强，具体原因见：https://github.com/xiaoymin/knife4j/issues/874 - setting: - language: zh_cn # 工作流 Flowable 配置 flowable: @@ -257,14 +259,6 @@ yudao: sender-kafka: topic: ${spring.application.name}-websocket # 消息发送的 Kafka Topic consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 Kafka Consumer Group - swagger: - title: 芋道快速开发平台 - description: 提供管理后台、用户 App 的所有功能 - version: ${yudao.info.version} - url: ${yudao.web.admin-ui.url} - email: xingyu4j@vip.qq.com - license: MIT - license-url: https://gitee.com/zhijiantianya/ruoyi-vue-pro/blob/master/LICENSE codegen: base-package: ${yudao.info.base-package} db-schemas: ${spring.datasource.dynamic.datasource.master.name} @@ -315,4 +309,4 @@ yudao: debug: false # 插件配置 TODO 芋艿：【IOT】需要处理下 pf4j: - pluginsDir: /Users/anhaohao/code/gitee/ruoyi-vue-pro/plugins # 插件目录 \ No newline at end of file + pluginsDir: /Users/anhaohao/code/gitee/ruoyi-vue-pro/plugins # 插件目录