From 1296549d1d596ffc481ffb7108331a23c6147dea Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 8 Sep 2019 10:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0swagger-bootstrap-ui=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=EF=BC=8C=E7=94=9F=E6=88=90=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-api/pom.xml | 13 ++- .../common/config/SwaggerConfiguration.java | 82 +++++++++---------- .../auth/controller/AuthController.java | 6 +- .../shop/controller/IndexController.java | 16 ++++ .../app/modular/shop/service/vo/PageVO.java | 21 +++++ 5 files changed, 94 insertions(+), 44 deletions(-) create mode 100644 ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/vo/PageVO.java diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index e288a0f..f89087b 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -61,12 +61,23 @@ springfox-swagger2 2.9.2 + + + io.swagger + swagger-annotations + 1.5.21 + + + + io.swagger + swagger-models + 1.5.21 + wiki.xsx spring-boot-starter-fast-redis 1.5.2 - com.github.xiaoymin swagger-bootstrap-ui diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/config/SwaggerConfiguration.java b/ruoyi-api/src/main/java/com/ruoyi/app/common/config/SwaggerConfiguration.java index 2eafbd1..801d498 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/common/config/SwaggerConfiguration.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/config/SwaggerConfiguration.java @@ -1,41 +1,41 @@ -//package com.ruoyi.app.common.config; -// -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import springfox.documentation.builders.ApiInfoBuilder; -//import springfox.documentation.builders.PathSelectors; -//import springfox.documentation.builders.RequestHandlerSelectors; -//import springfox.documentation.service.ApiInfo; -//import springfox.documentation.spi.DocumentationType; -//import springfox.documentation.spring.web.plugins.Docket; -//import springfox.documentation.swagger2.annotations.EnableSwagger2; -// -///** -// * @ClassName SwaggerConfiguration -// * @Author hupeng <610796224@qq.com> -// * @Date 2019/6/28 -// **/ -// -//@Configuration -//@EnableSwagger2 -//public class SwaggerConfiguration { -// @Bean -// public Docket createRestApi() { -// return new Docket(DocumentationType.SWAGGER_2) -// .apiInfo(apiInfo()) -// .select() -// .apis(RequestHandlerSelectors.basePackage("com.yixiang.security.modular")) -// .paths(PathSelectors.any()) -// .build(); -// } -// -// private ApiInfo apiInfo() { -// return new ApiInfoBuilder() -// .title("旅游系统API") -// .description("旅游系统API") -// .termsOfServiceUrl("http://localhost:8009/") -// .contact("610896224@qq.com") -// .version("1.0") -// .build(); -// } -//} +package com.ruoyi.app.common.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * @ClassName SwaggerConfiguration + * @Author hupeng <610796224@qq.com> + * @Date 2019/6/28 + **/ + +@Configuration +@EnableSwagger2 +public class SwaggerConfiguration { + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.ruoyi.app.modular")) + .paths(PathSelectors.any()) + .build(); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("供货商城API") + .description("供货商城API") + .termsOfServiceUrl("http://localhost:8009/") + .contact("610896224@qq.com") + .version("1.0") + .build(); + } +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/auth/controller/AuthController.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/auth/controller/AuthController.java index e63f6e6..8e99cce 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/auth/controller/AuthController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/auth/controller/AuthController.java @@ -9,6 +9,8 @@ import com.ruoyi.app.common.persistence.model.StoreMember; import com.ruoyi.app.modular.member.service.IMemberService; import com.ruoyi.app.modular.member.service.vo.LoginVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -25,7 +27,7 @@ import java.util.HashMap; //@RequestMapping(value = "/") @RestController @RequiredArgsConstructor(onConstructor = @__(@Autowired)) -//@Api(value = "认证授权模块", tags = "认证授权模块", description = "认证授权模块") +@Api(value = "认证授权模块", tags = "认证授权模块", description = "认证授权模块") public class AuthController { private final UserOperator userOperator; private final JwtOperator operator; @@ -49,7 +51,7 @@ public class AuthController { * @return token字符串 */ @PostMapping("/oauth/access_token") - // @ApiOperation(value = "获取token",notes = "获取token") + @ApiOperation(value = "获取token",notes = "获取token") public R loginReturnToken(@Validated @RequestBody LoginVO loginVO) { Boolean isProduct = false; String openid = null; diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/IndexController.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/IndexController.java index 5af0443..e958859 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/IndexController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/IndexController.java @@ -9,9 +9,14 @@ import com.ruoyi.app.modular.shop.service.dto.NewsDTO; import com.ruoyi.app.modular.shop.service.impl.AdServiceImpl; import com.ruoyi.app.modular.shop.service.impl.GoodsServiceImpl; import com.ruoyi.app.modular.shop.service.impl.NewsServiceImpl; +import com.ruoyi.app.modular.shop.service.vo.PageVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; @@ -27,13 +32,16 @@ import java.util.Map; @RestController @RequiredArgsConstructor(onConstructor = @__(@Autowired)) +@Api(value = "首页模块", tags = "首页模块", description = "首页模块") public class IndexController { private final UserOperator userOperator; private final GoodsServiceImpl goodsService; private final NewsServiceImpl newsService; private final AdServiceImpl adService; + @GetMapping("/shop/index-list") + @ApiOperation(value = "首页信息",notes = "首页信息") public R index(){ int userId = userOperator.getUser().getId(); @@ -51,4 +59,12 @@ public class IndexController { return R.success(map); //return null; } + + @GetMapping("/shop/news-lists") + public R news(@Validated @RequestBody PageVO pageVO){ + + List newsList = newsService.getList(pageVO.getPage(),pageVO.getLimit()); + + return R.success(newsList); + } } diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/vo/PageVO.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/vo/PageVO.java new file mode 100644 index 0000000..d46b2c1 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/vo/PageVO.java @@ -0,0 +1,21 @@ +package com.ruoyi.app.modular.shop.service.vo; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +@Data +public class PageVO { + //@NotBlank(message = "code必传") + @Min(message = "page为数值其值必须大于1",value = 1) + private int page; + @Min(message = "limit为数值其值必须大于1",value = 1) + private int limit; + + + + + + +}