diff --git a/bonus-auth/pom.xml b/bonus-auth/pom.xml index dd357f8..d9af30c 100644 --- a/bonus-auth/pom.xml +++ b/bonus-auth/pom.xml @@ -62,6 +62,17 @@ com.bonus bonus-common-log + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + com.bonus + bonus-common-swagger + diff --git a/bonus-auth/src/main/java/com/bonus/auth/BonusAuthApplication.java b/bonus-auth/src/main/java/com/bonus/auth/BonusAuthApplication.java index 73b6acc..9255fe1 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/BonusAuthApplication.java +++ b/bonus-auth/src/main/java/com/bonus/auth/BonusAuthApplication.java @@ -1,5 +1,6 @@ package com.bonus.auth; +import com.bonus.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -10,6 +11,7 @@ import com.bonus.common.security.annotation.EnableRyFeignClients; * * @author bonus */ +@EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) public class BonusAuthApplication diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/config/SwaggerProvider.java b/bonus-gateway/src/main/java/com/bonus/gateway/config/SwaggerProvider.java index 5bf8d5b..b0c0625 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/config/SwaggerProvider.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/config/SwaggerProvider.java @@ -53,7 +53,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu .contains(routeDefinition.getId())) .forEach(routeDefinition -> routeDefinition.getPredicates().stream() .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName())) - .filter(predicateDefinition -> !"bonus-auth".equalsIgnoreCase(routeDefinition.getId())) +// .filter(predicateDefinition -> !"bonus-auth".equalsIgnoreCase(routeDefinition.getId())) .forEach(predicateDefinition -> resourceList .add(swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs() .get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", SWAGGER2URL))))); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysConfigController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysConfigController.java index f873b3d..e918d72 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysConfigController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysConfigController.java @@ -6,6 +6,10 @@ import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -42,9 +46,17 @@ public class SysConfigController extends BaseController { /** * 获取参数配置列表 */ + + +// @ApiOperation("获取参数配置列表") @RequiresPermissions("system:config:list") @GetMapping("/list") @SysLog(title = "参数配置", businessType = OperaType.QUERY,logType = 0,module = "系统管理->参数配置") +// @ApiResponses(value = { +// @ApiResponse(code = 200, message = "成功", response = TableDataInfo.class), +// @ApiResponse(code = 400, message = "无效的ID"), +// @ApiResponse(code = 404, message = "未找到用户") +// }) public TableDataInfo list(SysConfig config) { try{ startPage();