From 0bd5026c32223defcc83e5cfef52266a10cc7d2a Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 19 Dec 2019 15:39:09 +0800 Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20swagger-bootstrap-ui-1.9.6=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=BA=20knife4j-2.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-gateway/pom.xml | 8 +-- .../config/RouterFunctionConfiguration.java | 27 ++++------ .../handler/SwaggerSecurityHandler.java | 52 +++++++++++++++++++ .../gateway/handler/SwaggerUiHandler.java | 52 +++++++++++++++++++ .../develop/controller/CodeController.java | 1 + .../controller/DatasourceController.java | 2 +- .../business/controller/WorkController.java | 2 +- .../controller/FlowFollowController.java | 2 +- .../controller/FlowManagerController.java | 2 +- .../controller/FlowModelController.java | 6 ++- .../resource/controller/OssController.java | 2 +- .../desk/controller/DashBoardController.java | 2 +- .../desk/controller/NoticeController.java | 1 + .../system/controller/ApiScopeController.java | 2 +- .../controller/AuthClientController.java | 16 +++--- .../controller/DataScopeController.java | 2 +- .../system/controller/DeptController.java | 1 + .../system/controller/DictBizController.java | 1 + .../system/controller/DictController.java | 1 + .../system/controller/MenuController.java | 1 + .../system/controller/ParamController.java | 1 + .../system/controller/RoleController.java | 1 + .../system/controller/TenantController.java | 1 + .../system/controller/TopMenuController.java | 6 +-- .../user/controller/UserController.java | 6 ++- doc/nacos/blade.yaml | 1 + 26 files changed, 156 insertions(+), 43 deletions(-) create mode 100644 blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java create mode 100644 blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 89987c51..7bdb7329 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -92,15 +92,15 @@ io.swagger swagger-models + + com.github.xiaoymin + knife4j-spring-ui + - - com.github.xiaoymin - swagger-bootstrap-ui - diff --git a/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java b/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java index df7efc60..385458c6 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java @@ -19,6 +19,8 @@ package org.springblade.gateway.config; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.gateway.handler.SwaggerResourceHandler; +import org.springblade.gateway.handler.SwaggerSecurityHandler; +import org.springblade.gateway.handler.SwaggerUiHandler; import org.springblade.gateway.props.AuthProperties; import org.springblade.gateway.props.RouteProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,7 +33,6 @@ import org.springframework.http.MediaType; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.web.cors.reactive.CorsUtils; -import org.springframework.web.filter.reactive.HiddenHttpMethodFilter; import org.springframework.web.reactive.function.server.RequestPredicates; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; @@ -52,6 +53,8 @@ import reactor.core.publisher.Mono; public class RouterFunctionConfiguration { private final SwaggerResourceHandler swaggerResourceHandler; + private final SwaggerSecurityHandler swaggerSecurityHandler; + private final SwaggerUiHandler swaggerUiHandler; /** * 这里为支持的请求头，如果有自定义的header字段请自己添加 @@ -87,26 +90,14 @@ public class RouterFunctionConfiguration { }; } - @Bean public RouterFunction routerFunction() { return RouterFunctions.route(RequestPredicates.GET("/swagger-resources") - .and(RequestPredicates.accept(MediaType.ALL)), swaggerResourceHandler); - - } - - /** - * 解决 Only one connection receive subscriber allowed. - * 参考：https://github.com/spring-cloud/spring-cloud-gateway/issues/541 - */ - @Bean - public HiddenHttpMethodFilter hiddenHttpMethodFilter() { - return new HiddenHttpMethodFilter() { - @Override - public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - return chain.filter(exchange); - } - }; + .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/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java new file mode 100644 index 00000000..72c97093 --- /dev/null +++ b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerSecurityHandler.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ + +package org.springblade.gateway.handler; + +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.SecurityConfigurationBuilder; + +/** + * SwaggerSecurityHandler + * + * @author lengleng + */ +@Slf4j +@Component +public class SwaggerSecurityHandler implements HandlerFunction { + + /** + * 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_UTF8) + .body(BodyInserters.fromObject(SecurityConfigurationBuilder.builder().build())); + } +} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java new file mode 100644 index 00000000..5e928ca7 --- /dev/null +++ b/blade-gateway/src/main/java/org/springblade/gateway/handler/SwaggerUiHandler.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ + +package org.springblade.gateway.handler; + +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.UiConfigurationBuilder; + +/** + * SwaggerUiHandler + * + * @author lengleng + */ +@Slf4j +@Component +public class SwaggerUiHandler implements HandlerFunction { + + /** + * 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_UTF8) + .body(BodyInserters.fromObject(UiConfigurationBuilder.builder().build())); + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java index 9e9a3e81..93d12336 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java @@ -17,6 +17,7 @@ package org.springblade.develop.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java index 8f9a83d0..8cce760f 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/DatasourceController.java @@ -19,7 +19,7 @@ package org.springblade.develop.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flow/business/controller/WorkController.java b/blade-ops/blade-flow/src/main/java/org/springblade/flow/business/controller/WorkController.java index 2f31378e..27d36f06 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flow/business/controller/WorkController.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flow/business/controller/WorkController.java @@ -19,7 +19,7 @@ package org.springblade.flow.business.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.flowable.engine.TaskService; diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java index 0fd55430..766ba88c 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java @@ -18,7 +18,7 @@ package org.springblade.flow.engine.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java index c8191012..0314eaaa 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java @@ -19,7 +19,7 @@ package org.springblade.flow.engine.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; diff --git a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowModelController.java b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowModelController.java index 57e82b2b..bf8fcbc9 100644 --- a/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowModelController.java +++ b/blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowModelController.java @@ -17,7 +17,11 @@ package org.springblade.flow.engine.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.*; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java index 672f4561..e858567d 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java @@ -19,7 +19,7 @@ package org.springblade.resource.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java index fcf2ce27..3a139617 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java @@ -2,7 +2,7 @@ package org.springblade.desk.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import org.springblade.core.tool.api.R; import org.springblade.core.tool.support.Kv; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java index 33daaee6..f005b4c3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java @@ -17,6 +17,7 @@ package org.springblade.desk.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.common.cache.CacheNames; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ApiScopeController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ApiScopeController.java index e44415a7..1af0de91 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ApiScopeController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ApiScopeController.java @@ -19,7 +19,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java index d8cd2b96..24857e6e 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/AuthClientController.java @@ -19,7 +19,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -63,7 +63,7 @@ public class AuthClientController extends BladeController { } /** - * 分页 + * 分页 */ @GetMapping("/list") @ApiOperationSupport(order = 2) @@ -74,7 +74,7 @@ public class AuthClientController extends BladeController { } /** - * 新增 + * 新增 */ @PostMapping("/save") @ApiOperationSupport(order = 3) @@ -84,7 +84,7 @@ public class AuthClientController extends BladeController { } /** - * 修改 + * 修改 */ @PostMapping("/update") @ApiOperationSupport(order = 4) @@ -94,7 +94,7 @@ public class AuthClientController extends BladeController { } /** - * 新增或修改 + * 新增或修改 */ @PostMapping("/submit") @ApiOperationSupport(order = 5) @@ -103,9 +103,9 @@ public class AuthClientController extends BladeController { return R.status(clientService.saveOrUpdate(authClient)); } - + /** - * 删除 + * 删除 */ @PostMapping("/remove") @ApiOperationSupport(order = 6) @@ -114,5 +114,5 @@ public class AuthClientController extends BladeController { return R.status(clientService.deleteLogic(Func.toLongList(ids))); } - + } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DataScopeController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DataScopeController.java index b1c86431..b87a1d34 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DataScopeController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DataScopeController.java @@ -19,7 +19,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java index f630180f..68f04f2a 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java @@ -17,6 +17,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java index 826a12fd..6a4c7803 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java @@ -17,6 +17,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java index 8274a8c9..57902681 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java @@ -17,6 +17,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java index 07154567..ec293cb1 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java @@ -16,6 +16,7 @@ */ package org.springblade.system.controller; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java index 6eba336f..e4cf5cae 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java @@ -17,6 +17,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java index fd118c08..52e2cccc 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java @@ -17,6 +17,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java index f2e3211e..f9eff0e0 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java @@ -19,6 +19,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java index dab25059..f912d908 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java @@ -19,7 +19,7 @@ package org.springblade.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; @@ -105,7 +105,7 @@ public class TopMenuController extends BladeController { return R.status(topMenuService.saveOrUpdate(topMenu)); } - + /** * 删除 顶部菜单表 */ @@ -129,5 +129,5 @@ public class TopMenuController extends BladeController { return R.status(temp); } - + } diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java index 74264fcb..55b1fb15 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -19,7 +19,11 @@ package org.springblade.system.user.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.*; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index fa79590a..960ce732 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -69,6 +69,7 @@ management: #blade配置 blade: xss: + enable: true skip-url: - /weixin - /notice/submit