修改swagger2

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 账号管理服务

cdp-iaas/gateway-server/pom.xml

@@ -90,6 +90,11 @@
         </dependency>
 
 
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

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;
@@ -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);
     }

cdp-iaas/gateway-server/src/main/java/com/baiye/handler/SwaggerUiHandler.java

@@ -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<ServerResponse> {
-
-	private final UiConfiguration uiConfiguration;
-
-	/**
-	 * Handle the given request.
-	 * @param request the request to handler
-	 * @return the response
-	 */
-	@Override
-	public Mono<ServerResponse> handle(ServerRequest request) {
-		return ServerResponse.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(BodyInserters
-				.fromValue(Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build())));
-	}
-
-}

cdp-iaas/gateway-server/src/main/java/com/baiye/mapper/PredicateMapper.java

@@ -2,7 +2,6 @@ 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;
 

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==

pom.xml

@@ -41,7 +41,7 @@
         <jaspyt.version>2.1.0</jaspyt.version>
         <hutool.version>5.7.21</hutool.version>
         <okhttp.version>3.11.0</okhttp.version>
-        <swagger2.version>3.0.0</swagger2.version>
+        <swagger2.version>2.9.2</swagger2.version>
         <fastjson.version>1.2.70</fastjson.version>
         <joda-time.version>2.10</joda-time.version>
         <easyexcel.version>2.2.5</easyexcel.version>
@@ -83,6 +83,8 @@
             <artifactId>swagger-annotations</artifactId>
         </dependency>
 
+
+
         <!-- 仅仅包含mybatis plus的相关注解 -->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -260,6 +262,12 @@
                 <version>${ip2region.version}</version>
             </dependency>
 
+
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${swagger2.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>