From 8ebdff5e237dbb7e1761817876cd8fd348c2c3bc Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 21 Feb 2025 15:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dk-common/common-cloudsdk/pom.xml | 8 +-- .../wayline/api/IHttpWaylineService.java | 4 +- .../common/sdk/swagger/SwaggerConfig.java | 56 ------------------- dk-common/common-core/pom.xml | 2 +- dk-common/common-json/pom.xml | 2 +- dk-common/common-web/pom.xml | 2 +- 6 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/swagger/SwaggerConfig.java diff --git a/dk-common/common-cloudsdk/pom.xml b/dk-common/common-cloudsdk/pom.xml index 278a1d4..4263246 100644 --- a/dk-common/common-cloudsdk/pom.xml +++ b/dk-common/common-cloudsdk/pom.xml @@ -18,15 +18,11 @@ spring-integration-mqtt ${spring-integration-mqtt.version} - - org.springdoc - springdoc-openapi-ui - ${openapi-ui.version} - org.dromara - common-core + common-web + diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java index 31cd61e..66beed0 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java @@ -14,7 +14,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import org.springdoc.api.annotations.ParameterObject; + import org.springframework.web.bind.annotation.*; @@ -42,7 +42,7 @@ public interface IHttpWaylineService { "the query conditions. The query condition field in pilot is fixed.") @GetMapping(PREFIX + "/workspaces/waylines") HttpResultResponse> getWaylineList( - @Valid @ParameterObject GetWaylineListRequest request, + @Valid GetWaylineListRequest request, HttpServletRequest req, HttpServletResponse rsp); /** diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/swagger/SwaggerConfig.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/swagger/SwaggerConfig.java deleted file mode 100644 index 2db2e05..0000000 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/swagger/SwaggerConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.dromara.common.sdk.swagger; - -import io.swagger.v3.oas.annotations.OpenAPIDefinition; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.models.Components; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.info.License; -import io.swagger.v3.oas.models.security.SecurityScheme; -import org.springdoc.core.GroupedOpenApi; -import org.springdoc.core.SpringDocConfigProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @author sean - * @version 1.7 - * @date 2023/6/14 - */ -@Configuration -@OpenAPIDefinition(security = {@SecurityRequirement(name = "default")}) -public class SwaggerConfig { - - @Bean - public OpenAPI openAPI() { - return new OpenAPI() - .info(new Info().title("CloudSDK API").description("All HTTP interfaces encapsulated by CloudSDK.") - .license(new License().name("LICENSE").url("https://github.com/dji-sdk/DJI-Cloud-API-Demo/blob/main/LICENSE")) - .version("1.0.0")).components(components()); - } - - @Bean - public SecurityScheme securityScheme() { - return new SecurityScheme().type(SecurityScheme.Type.APIKEY).in(SecurityScheme.In.HEADER).name("x-auth-token"); - } - - @Bean - public Components components() { - return new Components() - .addSecuritySchemes("default", securityScheme()); - } - - @Bean - public GroupedOpenApi sdkOpenApi() { - return GroupedOpenApi.builder().group("CloudSDK") - .packagesToScan("org.dromara.common").build(); - } - - @Bean - public SpringDocConfigProperties springDocConfigProperties(SpringDocConfigProperties properties) { - properties.setDefaultFlatParamObject(false); - properties.setDefaultSupportFormData(true); - properties.setDefaultProducesMediaType("application/json"); - return properties; - } -} diff --git a/dk-common/common-core/pom.xml b/dk-common/common-core/pom.xml index 1f60d62..0e5910d 100644 --- a/dk-common/common-core/pom.xml +++ b/dk-common/common-core/pom.xml @@ -12,7 +12,7 @@ common-core - ruoyi-common-core 核心模块 + common-core 核心模块 diff --git a/dk-common/common-json/pom.xml b/dk-common/common-json/pom.xml index e00e911..d72c53e 100644 --- a/dk-common/common-json/pom.xml +++ b/dk-common/common-json/pom.xml @@ -12,7 +12,7 @@ common-json - ruoyi-common-json 序列化模块 + common-json 序列化模块 diff --git a/dk-common/common-web/pom.xml b/dk-common/common-web/pom.xml index 48bd191..8a05503 100644 --- a/dk-common/common-web/pom.xml +++ b/dk-common/common-web/pom.xml @@ -12,7 +12,7 @@ common-web - ruoyi-common-web web服务 + common-web web服务