diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 20294a4..eb97e1c 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -20,6 +20,16 @@ io.springfox springfox-swagger2 + + + io.swagger + swagger-models + + + io.swagger + swagger-annotations + + io.springfox @@ -30,6 +40,16 @@ com.github.xiaoymin knife4j-openapi2-spring-boot-starter + + + io.springfox + springfox-bean-validators + + + io.springfox + springfox-spring-webmvc + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java index da05394..83a20fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java @@ -90,7 +90,7 @@ public class TestController extends BaseController { @ApiModel(value = "UserEntity", description = "用户实体") class UserEntity { - @ApiModelProperty("用户ID") + @ApiModelProperty(name = "用户ID") private Integer userId; @ApiModelProperty("用户名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index 0ff64ff..52c45cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -48,7 +48,7 @@ public class SwaggerConfig { */ @Bean public Docket createRestApi () { - return new Docket(DocumentationType.SWAGGER_2) + return new Docket(DocumentationType.OAS_30) // 是否启用Swagger .enable(enabled) // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息) @@ -109,9 +109,9 @@ public class SwaggerConfig { // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题:若依管理系统_接口文档") + .title("标题:接口文档") // 描述 - .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") + .description("描述:接口文档") // 作者信息 .contact(new Contact(ruoyiConfig.getName(), null, null)) // 版本 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index ec5e828..d4d10db 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -149,6 +149,12 @@ lombok + + io.swagger + swagger-annotations + 1.5.20 + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java b/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java index d416f36..b88b66a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/book/domain/BookInfo.java @@ -5,6 +5,7 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,6 +28,7 @@ import com.ruoyi.common.core.domain.BaseEntity; @AllArgsConstructor @TableName("book_info") @EqualsAndHashCode(callSuper = true) +@ApiModel(value = "UserEntity", description = "用户实体") public class BookInfo extends BaseEntity { private static final long serialVersionUID = 1L;