From 108611da11364c9e9c104204080ab5492b455a56 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 19 May 2022 14:32:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9swagger2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++- cdp-iaas/gateway-server/pom.xml | 5 +++ .../config/RouterFunctionConfiguration.java | 6 +-- .../com/baiye/handler/SwaggerUiHandler.java | 40 ------------------- .../com/baiye/mapper/PredicateMapper.java | 3 +- .../src/main/resources/config/application.yml | 2 - pom.xml | 10 ++++- 7 files changed, 22 insertions(+), 52 deletions(-) delete mode 100644 cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java diff --git a/README.md b/README.md index d88fc0a..74b1a08 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,12 @@ ## 相关主体结构 cdp-common 公用 + - cdp-common-core 基础模块用于公用类 + - cdp-common-exception 公用异常 + - cdp-common-mybatist-plus mybatis-plus封装 + - cdp-common-security 鉴权服务 cdp-iaas 基础服务 - - authorization-server 授权验证 + - authorization-server 授权验证管理在线用户 - gateway-server 网关服务 cdp-manager - account-manager-server 账号管理服务 @@ -29,4 +33,4 @@ ## 内部服务结构 xxx xxx-api 做api接口-打成jar -> 给下面的service提供依赖 - xxx-service 具体的服务逻辑-打成war \ No newline at end of file + xxx-service 具体的服务逻辑-打成war diff --git a/cdp-iaas/gateway-server/pom.xml b/cdp-iaas/gateway-server/pom.xml index 2092cb0..7aea2e9 100644 --- a/cdp-iaas/gateway-server/pom.xml +++ b/cdp-iaas/gateway-server/pom.xml @@ -90,6 +90,11 @@ + + io.springfox + springfox-swagger2 + + org.springframework.boot spring-boot-starter-test diff --git a/cdp-iaas/gateway-server/src/main/java/com/baiye/config/RouterFunctionConfiguration.java b/cdp-iaas/gateway-server/src/main/java/com/baiye/config/RouterFunctionConfiguration.java index f5f6986..ee57372 100644 --- a/cdp-iaas/gateway-server/src/main/java/com/baiye/config/RouterFunctionConfiguration.java +++ b/cdp-iaas/gateway-server/src/main/java/com/baiye/config/RouterFunctionConfiguration.java @@ -2,7 +2,6 @@ package com.baiye.config; import com.baiye.handler.SwaggerResourceHandler; import com.baiye.handler.SwaggerSecurityHandler; -import com.baiye.handler.SwaggerUiHandler; import com.baiye.handler.ValidateCodeHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -14,7 +13,7 @@ import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; /** - * + * * @description 路由配置类 * @author Enzo * @date 2020-07-29 @@ -30,7 +29,6 @@ public class RouterFunctionConfiguration { private final SwaggerSecurityHandler swaggerSecurityHandler; - private final SwaggerUiHandler swaggerUiHandler; @SuppressWarnings("rawtypes") @Bean @@ -41,8 +39,6 @@ public class RouterFunctionConfiguration { validateCodeHandler) .andRoute(RequestPredicates.GET("/swagger-resources").and(RequestPredicates.accept(MediaType.ALL)), swaggerResourceHandler) - .andRoute(RequestPredicates.GET("/swagger-resources/configuration/ui") - .and(RequestPredicates.accept(MediaType.ALL)), swaggerUiHandler) .andRoute(RequestPredicates.GET("/swagger-resources/configuration/security") .and(RequestPredicates.accept(MediaType.ALL)), swaggerSecurityHandler); } diff --git a/cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java b/cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java deleted file mode 100644 index 44670d8..0000000 --- a/cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.baiye.handler; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.reactive.function.BodyInserters; -import org.springframework.web.reactive.function.server.HandlerFunction; -import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.reactive.function.server.ServerResponse; -import reactor.core.publisher.Mono; -import springfox.documentation.swagger.web.UiConfiguration; -import springfox.documentation.swagger.web.UiConfigurationBuilder; - -import java.util.Optional; - -/** - * @author Lengleng - * @date 2018-07-19 - */ -@Slf4j -@Component -@RequiredArgsConstructor -public class SwaggerUiHandler implements HandlerFunction { - - private final UiConfiguration uiConfiguration; - - /** - * Handle the given request. - * @param request the request to handler - * @return the response - */ - @Override - public Mono handle(ServerRequest request) { - return ServerResponse.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(BodyInserters - .fromValue(Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()))); - } - -} diff --git a/cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java b/cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java index 259a4b7..523625e 100644 --- a/cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java +++ b/cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java @@ -2,12 +2,11 @@ package com.baiye.mapper; import com.baiye.entity.Predicate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import java.util.Set; /** - * + * * @description * @author Enzo * @date 2020-08-28 16:42 diff --git a/cdp-iaas/gateway-server/src/main/resources/config/application.yml b/cdp-iaas/gateway-server/src/main/resources/config/application.yml index ef8191b..ff2bd00 100644 --- a/cdp-iaas/gateway-server/src/main/resources/config/application.yml +++ b/cdp-iaas/gateway-server/src/main/resources/config/application.yml @@ -62,8 +62,6 @@ spring: profiles: active: dev - - security: decode: private-key: MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKmB93JM4cIFilnvcV1gSuPc3GlFUwo3JGGbOTkL9JP0W9Vz5CsbYbVbEtU+gnw6m3//4DSmOYeqlJJzsylVLdSe4flx2MsCceXxudsE4dHKqYU6zxBvsZB+FNFRoA2kjAtSJDaBCRryP5zXYVUYtVZW16pHkco/I35NwDevkvsJAgMBAAECgYEAkb5SoO9jyOv0mgFbirrJiYQT61uU25qv6FCLcfZKk5AuCai8jSfc6g7lcX5uuRu3KeY6w2oM2w4a8pUSfb5kSR4SAzSL6A94GIKfr3FDBxhrMxB+ko5vDoOwmmDi6jLGUFhxpiwT2Dz2c/Jz2kZJVb6RetOhh8fzdh3cz8jNQoECQQDg3+rX4d7WTS8xIFf3aQ8UKSCyDYpoNCVEsh9jaCsLrhsNXHMw8IX4KTjxsMvf3djztYuNsULHtwMkywGOA1ixAkEAwPg00MkqhBH1we4N8MCnXajZ+/UWch5b40QFBZrcbvx2k/CI25xH52FccmsEvVfuv1uFPto4sPTn7zAcKOzd2QJBANNEK3tkvhkx7ItH6r0LW9pCBXCiXg0mKHlQq0KWRBK2IL49xA8PeZ27BL+0rOWGpGPahOC6z5WYMADqJGzKYhECQQC1xZjKy5QXEGv1n+7VyERfv3yHEJlyKhLYg+xPGU9n5L02IjBo3lAFLvtMdG7khP5Kl0VurVUVq70G3MTJ8EYRAkEAm2hy1mCTMTWJYSlXieWnZxJaXn0MOrv4RyRsoXUTH1tgZ6MCqm0a7YxU0byPU0h1W2kLXXZa8P+vu2finQkvCA== diff --git a/pom.xml b/pom.xml index b471af1..ed3caf9 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.1.0 5.7.21 3.11.0 - 3.0.0 + 2.9.2 1.2.70 2.10 2.2.5 @@ -83,6 +83,8 @@ swagger-annotations + + com.baomidou @@ -260,6 +262,12 @@ ${ip2region.version} + + + io.springfox + springfox-swagger2 + ${swagger2.version} +