diff --git a/pom.xml b/pom.xml index 8ff96ab9..407844f8 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,11 @@ swagger-models 1.5.21 + + com.github.xiaoymin + swagger-bootstrap-ui + 1.9.3 + diff --git a/yshop-api/pom.xml b/yshop-api/pom.xml index 56350882..e6b05b25 100644 --- a/yshop-api/pom.xml +++ b/yshop-api/pom.xml @@ -58,31 +58,6 @@ 2.0 - - - - - - - - - - - - - - - - - - - - - - com.github.xiaoymin - swagger-bootstrap-ui - 1.9.3 - p6spy p6spy @@ -93,12 +68,6 @@ core 3.3.3 - - - - - - com.aliyun aliyun-java-sdk-core diff --git a/yshop-api/src/main/java/co/yixiang/config/SwaggerConfiguration.java b/yshop-api/src/main/java/co/yixiang/config/SwaggerConfiguration.java index eda5dba1..7f8034b9 100644 --- a/yshop-api/src/main/java/co/yixiang/config/SwaggerConfiguration.java +++ b/yshop-api/src/main/java/co/yixiang/config/SwaggerConfiguration.java @@ -1,5 +1,6 @@ package co.yixiang.config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; @@ -19,9 +20,13 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @Configuration @EnableSwagger2 public class SwaggerConfiguration { + @Value("${swagger.enabled}") + private Boolean enabled; + @Bean public Docket createRestApi() { return new Docket(DocumentationType.SWAGGER_2) + .enable(enabled) .apiInfo(apiInfo()) .select() .apis(RequestHandlerSelectors.basePackage("co.yixiang.modules")) @@ -31,11 +36,11 @@ public class SwaggerConfiguration { private ApiInfo apiInfo() { return new ApiInfoBuilder() - .title("Yshop商城API") - .description("Yshop商城API") - .termsOfServiceUrl("http://localhost:8009/") + .title("yshop商城移动端API") + .description("yshop商城移动端API") + .termsOfServiceUrl("http://localhost:8009/api") .contact("610796224@qq.com") - .version("1.0") + .version("1.6") .build(); } } diff --git a/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java b/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java index e753ff3f..1ca3fbfe 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java @@ -1,6 +1,8 @@ package co.yixiang.modules.monitor.rest; import co.yixiang.annotation.Limit; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,6 +15,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @RestController @RequestMapping("api") +@Api(value = "接口限流测试", tags = "接口限流测试", description = "接口限流测试") public class LimitController { private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger(); @@ -21,6 +24,7 @@ public class LimitController { */ @Limit(key = "test", period = 60, count = 10, name = "testLimit", prefix = "limit") @GetMapping("/limit") + @ApiOperation(value = "测试示例",notes = "测试示例") public int testLimit() { return ATOMIC_INTEGER.incrementAndGet(); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java b/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java deleted file mode 100644 index f17daa52..00000000 --- a/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java +++ /dev/null @@ -1,47 +0,0 @@ -package co.yixiang.modules.monitor.rest; - -import co.yixiang.modules.monitor.domain.vo.RedisVo; -import co.yixiang.modules.monitor.service.RedisService; -import co.yixiang.aop.log.Log; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -/** - * @author Zheng Jie - * @date 2018-12-10 - */ -@RestController -@RequestMapping("api") -public class RedisController { - - @Autowired - private RedisService redisService; - - @Log("查询Redis缓存") - @GetMapping(value = "/redis") - @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_SELECT')") - public ResponseEntity getRedis(String key, Pageable pageable){ - return new ResponseEntity(redisService.findByKey(key,pageable), HttpStatus.OK); - } - - @Log("删除Redis缓存") - @DeleteMapping(value = "/redis") - @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_DELETE')") - public ResponseEntity delete(@RequestBody RedisVo resources){ - redisService.delete(resources.getKey()); - return new ResponseEntity(HttpStatus.OK); - } - - @Log("清空Redis缓存") - @DeleteMapping(value = "/redis/all") - @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_DELETE')") - public ResponseEntity deleteAll(){ - redisService.flushdb(); - return new ResponseEntity(HttpStatus.OK); - } -} diff --git a/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/VisitsController.java b/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/VisitsController.java deleted file mode 100644 index 51c9d315..00000000 --- a/yshop-api/src/main/java/co/yixiang/modules/monitor/rest/VisitsController.java +++ /dev/null @@ -1,39 +0,0 @@ -package co.yixiang.modules.monitor.rest; - -import co.yixiang.modules.monitor.service.VisitsService; -import co.yixiang.utils.RequestHolder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author Zheng Jie - * @date 2018-12-13 - */ -@RestController -@RequestMapping("api") -public class VisitsController { - - @Autowired - private VisitsService visitsService; - - @PostMapping(value = "/visits") - public ResponseEntity create(){ - visitsService.count(RequestHolder.getHttpServletRequest()); - return new ResponseEntity(HttpStatus.CREATED); - } - - @GetMapping(value = "/visits") - public ResponseEntity get(){ - return new ResponseEntity(visitsService.get(),HttpStatus.OK); - } - - @GetMapping(value = "/visits/chartData") - public ResponseEntity getChartData(){ - return new ResponseEntity(visitsService.getChartData(),HttpStatus.OK); - } -} diff --git a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java index 216d22f9..03fde06e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java @@ -17,6 +17,7 @@ import co.yixiang.utils.EncryptUtils; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.SecurityUtils; import com.vdurmont.emoji.EmojiParser; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import co.yixiang.aop.log.Log; @@ -45,6 +46,7 @@ import java.util.Map; */ @Slf4j @RestController +@Api(value = "H5认证模块", tags = "H5认证模块", description = "H5认证模块") public class AuthenticationController extends BaseController { @Value("${jwt.header}") @@ -71,6 +73,7 @@ public class AuthenticationController extends BaseController { */ @Log("用户登录") @PostMapping(value = "${jwt.auth.path}") + @ApiOperation(value = "用户登录",notes = "用户登录") public ApiResult> login(@Validated @RequestBody AuthorizationUser authorizationUser){ final JwtUser jwtUser = (JwtUser) userDetailsService.loadUserByUsername(authorizationUser.getAccount()); @@ -173,6 +176,7 @@ public class AuthenticationController extends BaseController { * @return */ @PostMapping(value = "/auth/logout") + @ApiOperation(value = "退出登录",notes = "退出登录") public ApiResult logout(){ return ApiResult.ok("退出成功"); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java index b449efb1..509861f5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreCategoryController.java @@ -26,7 +26,7 @@ import javax.validation.Valid; */ @Slf4j @RestController -@Api("商品分类表 API") +@Api(value = "商品分类", tags = "商品分类", description = "商品分类") public class StoreCategoryController extends BaseController { @Autowired diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java index e8d35dfe..de9c2e3c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java @@ -23,6 +23,8 @@ import co.yixiang.mp.utils.JsonUtils; import co.yixiang.utils.EncryptUtils; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import me.chanjar.weixin.common.bean.WxAccessToken; import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; @@ -50,6 +52,7 @@ import java.util.concurrent.locks.Lock; */ @RestController @RequiredArgsConstructor(onConstructor = @__(@Autowired)) +@Api(value = "微信小程序", tags = "微信小程序", description = "微信小程序") public class WxMaUserController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final WxMaService wxMaService; @@ -66,6 +69,7 @@ public class WxMaUserController { * 小程序登陆接口 */ @PostMapping("/wechat/mp_auth") + @ApiOperation(value = "小程序登陆",notes = "小程序登陆") public ApiResult login(@RequestParam(value = "code") String code, @RequestParam(value = "spread") String spread, @RequestParam(value = "encryptedData") String encryptedData, diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java index 0dc61214..069714d1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java @@ -21,7 +21,7 @@ import io.swagger.annotations.*; * @author xuwenbo * @date 2019-12-22 */ -@Api(tags = "YxStoreBargain管理") +@Api(tags = "砍价管理") @RestController @RequestMapping("api") public class YxStoreBargainController { @@ -29,8 +29,8 @@ public class YxStoreBargainController { @Autowired private YxStoreBargainService yxStoreBargainService; - @Log("查询YxStoreBargain") - @ApiOperation(value = "查询YxStoreBargain") + @Log("查询砍价") + @ApiOperation(value = "查询砍价") @GetMapping(value = "/yxStoreBargain") @PreAuthorize("hasAnyRole('ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_SELECT')") public ResponseEntity getYxStoreBargains(YxStoreBargainQueryCriteria criteria, Pageable pageable){ @@ -39,8 +39,8 @@ public class YxStoreBargainController { - @Log("修改YxStoreBargain") - @ApiOperation(value = "修改YxStoreBargain") + @Log("修改砍价") + @ApiOperation(value = "修改砍价") @PutMapping(value = "/yxStoreBargain") @PreAuthorize("hasAnyRole('ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreBargain resources){ @@ -62,8 +62,8 @@ public class YxStoreBargainController { } } - @Log("删除YxStoreBargain") - @ApiOperation(value = "删除YxStoreBargain") + @Log("删除砍价") + @ApiOperation(value = "删除砍价") @DeleteMapping(value = "/yxStoreBargain/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java index 52f8aeeb..b9c6966f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java @@ -17,7 +17,7 @@ import io.swagger.annotations.*; * @author hupeng * @date 2019-11-09 */ -@Api(tags = "YxStoreCouponIssueUser管理") +@Api(tags = "优惠券前台用户领取记录管理") @RestController @RequestMapping("api") public class YxStoreCouponIssueUserController { @@ -25,24 +25,24 @@ public class YxStoreCouponIssueUserController { @Autowired private YxStoreCouponIssueUserService yxStoreCouponIssueUserService; - @Log("查询YxStoreCouponIssueUser") - @ApiOperation(value = "查询YxStoreCouponIssueUser") + @Log("查询") + @ApiOperation(value = "查询") @GetMapping(value = "/yxStoreCouponIssueUser") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_SELECT')") public ResponseEntity getYxStoreCouponIssueUsers(YxStoreCouponIssueUserQueryCriteria criteria, Pageable pageable){ return new ResponseEntity(yxStoreCouponIssueUserService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("新增YxStoreCouponIssueUser") - @ApiOperation(value = "新增YxStoreCouponIssueUser") + @Log("新增") + @ApiOperation(value = "新增") @PostMapping(value = "/yxStoreCouponIssueUser") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_CREATE')") public ResponseEntity create(@Validated @RequestBody YxStoreCouponIssueUser resources){ return new ResponseEntity(yxStoreCouponIssueUserService.create(resources),HttpStatus.CREATED); } - @Log("修改YxStoreCouponIssueUser") - @ApiOperation(value = "修改YxStoreCouponIssueUser") + @Log("修改") + @ApiOperation(value = "修改") @PutMapping(value = "/yxStoreCouponIssueUser") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreCouponIssueUser resources){ @@ -50,8 +50,8 @@ public class YxStoreCouponIssueUserController { return new ResponseEntity(HttpStatus.NO_CONTENT); } - @Log("删除YxStoreCouponIssueUser") - @ApiOperation(value = "删除YxStoreCouponIssueUser") + @Log("删除") + @ApiOperation(value = "删除") @DeleteMapping(value = "/yxStoreCouponIssueUser/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java index a5898ed9..a3db2a89 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java @@ -1,61 +1,61 @@ -package co.yixiang.modules.activity.rest; - -import co.yixiang.aop.log.Log; -import co.yixiang.modules.activity.domain.YxStoreVisit; -import co.yixiang.modules.activity.service.YxStoreVisitService; -import co.yixiang.modules.activity.service.dto.YxStoreVisitQueryCriteria; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; - -/** -* @author hupeng -* @date 2019-11-18 -*/ -@Api(tags = "YxStoreVisit管理") -@RestController -@RequestMapping("api") -public class YxStoreVisitController { - - @Autowired - private YxStoreVisitService yxStoreVisitService; - - @Log("查询YxStoreVisit") - @ApiOperation(value = "查询YxStoreVisit") - @GetMapping(value = "/yxStoreVisit") - @PreAuthorize("hasAnyRole('ADMIN','YXSTOREVISIT_ALL','YXSTOREVISIT_SELECT')") - public ResponseEntity getYxStoreVisits(YxStoreVisitQueryCriteria criteria, Pageable pageable){ - return new ResponseEntity(yxStoreVisitService.queryAll(criteria,pageable),HttpStatus.OK); - } - - @Log("新增YxStoreVisit") - @ApiOperation(value = "新增YxStoreVisit") - @PostMapping(value = "/yxStoreVisit") - @PreAuthorize("hasAnyRole('ADMIN','YXSTOREVISIT_ALL','YXSTOREVISIT_CREATE')") - public ResponseEntity create(@Validated @RequestBody YxStoreVisit resources){ - return new ResponseEntity(yxStoreVisitService.create(resources),HttpStatus.CREATED); - } - - @Log("修改YxStoreVisit") - @ApiOperation(value = "修改YxStoreVisit") - @PutMapping(value = "/yxStoreVisit") - @PreAuthorize("hasAnyRole('ADMIN','YXSTOREVISIT_ALL','YXSTOREVISIT_EDIT')") - public ResponseEntity update(@Validated @RequestBody YxStoreVisit resources){ - yxStoreVisitService.update(resources); - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - - @Log("删除YxStoreVisit") - @ApiOperation(value = "删除YxStoreVisit") - @DeleteMapping(value = "/yxStoreVisit/{id}") - @PreAuthorize("hasAnyRole('ADMIN','YXSTOREVISIT_ALL','YXSTOREVISIT_DELETE')") - public ResponseEntity delete(@PathVariable Integer id){ - yxStoreVisitService.delete(id); - return new ResponseEntity(HttpStatus.OK); - } -} \ No newline at end of file +//package co.yixiang.modules.activity.rest; +// +//import co.yixiang.aop.log.Log; +//import co.yixiang.modules.activity.domain.YxStoreVisit; +//import co.yixiang.modules.activity.service.YxStoreVisitService; +//import co.yixiang.modules.activity.service.dto.YxStoreVisitQueryCriteria; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.data.domain.Pageable; +//import org.springframework.http.HttpStatus; +//import org.springframework.http.ResponseEntity; +//import org.springframework.security.access.prepost.PreAuthorize; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.*; +//import io.swagger.annotations.*; +// +///** +//* @author hupeng +//* @date 2019-11-18 +//*/ +//@Api(tags = "fang管理") +//@RestController +//@RequestMapping("api") +//public class YxStoreVisitController { +// +// @Autowired +// private YxStoreVisitService yxStoreVisitService; +// +// @Log("查询YxStoreVisit") +// @ApiOperation(value = "查询YxStoreVisit") +// @GetMapping(value = "/yxStoreVisit") +// @PreAuthorize("hasAnyRole('ADMIN','YXSTOREVISIT_ALL','YXSTOREVISIT_SELECT')") +// public ResponseEntity getYxStoreVisits(YxStoreVisitQueryCriteria criteria, Pageable pageable){ +// return new ResponseEntity(yxStoreVisitService.queryAll(criteria,pageable),HttpStatus.OK); +// } +// +// @Log("新增YxStoreVisit") +// @ApiOperation(value = "新增YxStoreVisit") +// @PostMapping(value = "/yxStoreVisit") +// @PreAuthorize("hasAnyRole('ADMIN','YXSTOREVISIT_ALL','YXSTOREVISIT_CREATE')") +// public ResponseEntity create(@Validated @RequestBody YxStoreVisit resources){ +// return new ResponseEntity(yxStoreVisitService.create(resources),HttpStatus.CREATED); +// } +// +// @Log("修改YxStoreVisit") +// @ApiOperation(value = "修改YxStoreVisit") +// @PutMapping(value = "/yxStoreVisit") +// @PreAuthorize("hasAnyRole('ADMIN','YXSTOREVISIT_ALL','YXSTOREVISIT_EDIT')") +// public ResponseEntity update(@Validated @RequestBody YxStoreVisit resources){ +// yxStoreVisitService.update(resources); +// return new ResponseEntity(HttpStatus.NO_CONTENT); +// } +// +// @Log("删除YxStoreVisit") +// @ApiOperation(value = "删除YxStoreVisit") +// @DeleteMapping(value = "/yxStoreVisit/{id}") +// @PreAuthorize("hasAnyRole('ADMIN','YXSTOREVISIT_ALL','YXSTOREVISIT_DELETE')") +// public ResponseEntity delete(@PathVariable Integer id){ +// yxStoreVisitService.delete(id); +// return new ResponseEntity(HttpStatus.OK); +// } +//} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java index 08048e74..d7c2ba0b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java @@ -26,7 +26,7 @@ import io.swagger.annotations.*; * @author hupeng * @date 2019-11-14 */ -@Api(tags = "YxUserExtract管理") +@Api(tags = "提现管理") @RestController @RequestMapping("api") public class YxUserExtractController { @@ -40,8 +40,8 @@ public class YxUserExtractController { @Autowired private YxUserBillService yxUserBillService; - @Log("查询YxUserExtract") - @ApiOperation(value = "查询YxUserExtract") + @Log("查询") + @ApiOperation(value = "查询") @GetMapping(value = "/yxUserExtract") @PreAuthorize("hasAnyRole('ADMIN','YXUSEREXTRACT_ALL','YXUSEREXTRACT_SELECT')") public ResponseEntity getYxUserExtracts(YxUserExtractQueryCriteria criteria, Pageable pageable){ @@ -51,7 +51,7 @@ public class YxUserExtractController { @Log("修改") - @ApiOperation(value = "修改") + @ApiOperation(value = "修改审核") @PutMapping(value = "/yxUserExtract") @PreAuthorize("hasAnyRole('ADMIN','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT')") public ResponseEntity update(@Validated @RequestBody YxUserExtract resources){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java index 5a681779..95fd1b90 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java @@ -19,7 +19,7 @@ import io.swagger.annotations.*; * @author hupeng * @date 2019-12-12 */ -@Api(tags = "YxExpress管理") +@Api(tags = "快递管理") @RestController @RequestMapping("api") public class YxExpressController { @@ -27,16 +27,16 @@ public class YxExpressController { @Autowired private YxExpressService yxExpressService; - @Log("查询YxExpress") - @ApiOperation(value = "查询YxExpress") + @Log("查询快递") + @ApiOperation(value = "查询快递") @GetMapping(value = "/yxExpress") @PreAuthorize("hasAnyRole('ADMIN','YXEXPRESS_ALL','YXEXPRESS_SELECT')") public ResponseEntity getYxExpresss(YxExpressQueryCriteria criteria, Pageable pageable){ return new ResponseEntity(yxExpressService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("新增YxExpress") - @ApiOperation(value = "新增YxExpress") + @Log("新增快递") + @ApiOperation(value = "新增快递") @PostMapping(value = "/yxExpress") @PreAuthorize("hasAnyRole('ADMIN','YXEXPRESS_ALL','YXEXPRESS_CREATE')") public ResponseEntity create(@Validated @RequestBody YxExpress resources){ @@ -44,8 +44,8 @@ public class YxExpressController { return new ResponseEntity(yxExpressService.create(resources),HttpStatus.CREATED); } - @Log("修改YxExpress") - @ApiOperation(value = "修改YxExpress") + @Log("修改快递") + @ApiOperation(value = "修改快递") @PutMapping(value = "/yxExpress") @PreAuthorize("hasAnyRole('ADMIN','YXEXPRESS_ALL','YXEXPRESS_EDIT')") public ResponseEntity update(@Validated @RequestBody YxExpress resources){ @@ -54,8 +54,8 @@ public class YxExpressController { return new ResponseEntity(HttpStatus.NO_CONTENT); } - @Log("删除YxExpress") - @ApiOperation(value = "删除YxExpress") + @Log("删除快递") + @ApiOperation(value = "删除快递") @DeleteMapping(value = "/yxExpress/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXEXPRESS_ALL','YXEXPRESS_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java index 11c29e81..b1aa1d64 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java @@ -20,7 +20,7 @@ import io.swagger.annotations.*; * @author hupeng * @date 2019-12-04 */ -@Api(tags = "YxSystemUserLevel管理") +@Api(tags = "用户等级管理") @RestController @RequestMapping("api") public class YxSystemUserLevelController { @@ -46,8 +46,8 @@ public class YxSystemUserLevelController { return new ResponseEntity(yxSystemUserLevelService.create(resources),HttpStatus.CREATED); } - @Log("修改YxSystemUserLevel") - @ApiOperation(value = "修改YxSystemUserLevel") + @Log("修改") + @ApiOperation(value = "修改") @PutMapping(value = "/yxSystemUserLevel") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT')") public ResponseEntity update(@Validated @RequestBody YxSystemUserLevel resources){ @@ -56,8 +56,8 @@ public class YxSystemUserLevelController { return new ResponseEntity(HttpStatus.NO_CONTENT); } - @Log("删除YxSystemUserLevel") - @ApiOperation(value = "删除YxSystemUserLevel") + @Log("删除") + @ApiOperation(value = "删除") @DeleteMapping(value = "/yxSystemUserLevel/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java index 768e97a6..f0511c42 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java @@ -21,7 +21,7 @@ import io.swagger.annotations.*; * @author hupeng * @date 2019-12-04 */ -@Api(tags = "YxSystemUserTask管理") +@Api(tags = "用户任务管理") @RestController @RequestMapping("api") public class YxSystemUserTaskController { @@ -29,8 +29,8 @@ public class YxSystemUserTaskController { @Autowired private YxSystemUserTaskService yxSystemUserTaskService; - @Log("查询YxSystemUserTask") - @ApiOperation(value = "查询YxSystemUserTask") + @Log("查询") + @ApiOperation(value = "查询") @GetMapping(value = "/yxSystemUserTask") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_SELECT')") public ResponseEntity getYxSystemUserTasks(YxSystemUserTaskQueryCriteria criteria, @@ -43,16 +43,16 @@ public class YxSystemUserTaskController { HttpStatus.OK); } - @Log("新增YxSystemUserTask") - @ApiOperation(value = "新增YxSystemUserTask") + @Log("新增") + @ApiOperation(value = "新增") @PostMapping(value = "/yxSystemUserTask") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_CREATE')") public ResponseEntity create(@Validated @RequestBody YxSystemUserTask resources){ return new ResponseEntity(yxSystemUserTaskService.create(resources),HttpStatus.CREATED); } - @Log("修改YxSystemUserTask") - @ApiOperation(value = "修改YxSystemUserTask") + @Log("修改") + @ApiOperation(value = "修改") @PutMapping(value = "/yxSystemUserTask") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_EDIT')") public ResponseEntity update(@Validated @RequestBody YxSystemUserTask resources){ @@ -61,8 +61,8 @@ public class YxSystemUserTaskController { return new ResponseEntity(HttpStatus.NO_CONTENT); } - @Log("删除YxSystemUserTask") - @ApiOperation(value = "删除YxSystemUserTask") + @Log("删除") + @ApiOperation(value = "删除") @DeleteMapping(value = "/yxSystemUserTask/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java index 90aa0c55..608973b3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java @@ -17,7 +17,7 @@ import io.swagger.annotations.*; * @author hupeng * @date 2019-11-06 */ -@Api(tags = "YxUserBill管理") +@Api(tags = "用户账单管理") @RestController @RequestMapping("api") public class YxUserBillController { @@ -25,8 +25,8 @@ public class YxUserBillController { @Autowired private YxUserBillService yxUserBillService; - @Log("查询YxUserBill") - @ApiOperation(value = "查询YxUserBill") + @Log("查询") + @ApiOperation(value = "查询") @GetMapping(value = "/yxUserBill") @PreAuthorize("hasAnyRole('ADMIN','YXUSERBILL_ALL','YXUSERBILL_SELECT')") public ResponseEntity getYxUserBills(YxUserBillQueryCriteria criteria, Pageable pageable){ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java index e1db54a5..5428273e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java @@ -23,7 +23,7 @@ import io.swagger.annotations.*; * @author hupeng * @date 2019-10-10 */ -@Api(tags = "YxSystemConfig管理") +@Api(tags = "配置管理") @RestController @RequestMapping("api") public class YxSystemConfigController { @@ -31,7 +31,7 @@ public class YxSystemConfigController { @Autowired private YxSystemConfigService yxSystemConfigService; - @Log("查询YxSystemConfig") + @Log("查询") @ApiOperation(value = "查询YxSystemConfig") @GetMapping(value = "/yxSystemConfig") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_SELECT')") @@ -39,7 +39,7 @@ public class YxSystemConfigController { return new ResponseEntity(yxSystemConfigService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("新增YxSystemConfig") + @Log("新增或修改") @ApiOperation(value = "新增YxSystemConfig") @PostMapping(value = "/yxSystemConfig") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_CREATE')") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatUserController.java index 79f85813..0f7a897f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatUserController.java @@ -1,61 +1,61 @@ -package co.yixiang.modules.wechat.rest; - -import co.yixiang.aop.log.Log; -import co.yixiang.modules.wechat.domain.YxWechatUser; -import co.yixiang.modules.wechat.service.YxWechatUserService; -import co.yixiang.modules.wechat.service.dto.YxWechatUserQueryCriteria; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; - -/** -* @author hupeng -* @date 2019-12-13 -*/ -@Api(tags = "YxWechatUser管理") -@RestController -@RequestMapping("api") -public class YxWechatUserController { - - @Autowired - private YxWechatUserService yxWechatUserService; - - @Log("查询YxWechatUser") - @ApiOperation(value = "查询YxWechatUser") - @GetMapping(value = "/yxWechatUser") - @PreAuthorize("hasAnyRole('ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_SELECT')") - public ResponseEntity getYxWechatUsers(YxWechatUserQueryCriteria criteria, Pageable pageable){ - return new ResponseEntity(yxWechatUserService.queryAll(criteria,pageable),HttpStatus.OK); - } - - @Log("新增YxWechatUser") - @ApiOperation(value = "新增YxWechatUser") - @PostMapping(value = "/yxWechatUser") - @PreAuthorize("hasAnyRole('ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_CREATE')") - public ResponseEntity create(@Validated @RequestBody YxWechatUser resources){ - return new ResponseEntity(yxWechatUserService.create(resources),HttpStatus.CREATED); - } - - @Log("修改YxWechatUser") - @ApiOperation(value = "修改YxWechatUser") - @PutMapping(value = "/yxWechatUser") - @PreAuthorize("hasAnyRole('ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_EDIT')") - public ResponseEntity update(@Validated @RequestBody YxWechatUser resources){ - yxWechatUserService.update(resources); - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - - @Log("删除YxWechatUser") - @ApiOperation(value = "删除YxWechatUser") - @DeleteMapping(value = "/yxWechatUser/{uid}") - @PreAuthorize("hasAnyRole('ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_DELETE')") - public ResponseEntity delete(@PathVariable Integer uid){ - yxWechatUserService.delete(uid); - return new ResponseEntity(HttpStatus.OK); - } -} \ No newline at end of file +//package co.yixiang.modules.wechat.rest; +// +//import co.yixiang.aop.log.Log; +//import co.yixiang.modules.wechat.domain.YxWechatUser; +//import co.yixiang.modules.wechat.service.YxWechatUserService; +//import co.yixiang.modules.wechat.service.dto.YxWechatUserQueryCriteria; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.data.domain.Pageable; +//import org.springframework.http.HttpStatus; +//import org.springframework.http.ResponseEntity; +//import org.springframework.security.access.prepost.PreAuthorize; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.*; +//import io.swagger.annotations.*; +// +///** +//* @author hupeng +//* @date 2019-12-13 +//*/ +//@Api(tags = "YxWechatUser管理") +//@RestController +//@RequestMapping("api") +//public class YxWechatUserController { +// +// @Autowired +// private YxWechatUserService yxWechatUserService; +// +// @Log("查询YxWechatUser") +// @ApiOperation(value = "查询YxWechatUser") +// @GetMapping(value = "/yxWechatUser") +// @PreAuthorize("hasAnyRole('ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_SELECT')") +// public ResponseEntity getYxWechatUsers(YxWechatUserQueryCriteria criteria, Pageable pageable){ +// return new ResponseEntity(yxWechatUserService.queryAll(criteria,pageable),HttpStatus.OK); +// } +// +// @Log("新增YxWechatUser") +// @ApiOperation(value = "新增YxWechatUser") +// @PostMapping(value = "/yxWechatUser") +// @PreAuthorize("hasAnyRole('ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_CREATE')") +// public ResponseEntity create(@Validated @RequestBody YxWechatUser resources){ +// return new ResponseEntity(yxWechatUserService.create(resources),HttpStatus.CREATED); +// } +// +// @Log("修改YxWechatUser") +// @ApiOperation(value = "修改YxWechatUser") +// @PutMapping(value = "/yxWechatUser") +// @PreAuthorize("hasAnyRole('ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_EDIT')") +// public ResponseEntity update(@Validated @RequestBody YxWechatUser resources){ +// yxWechatUserService.update(resources); +// return new ResponseEntity(HttpStatus.NO_CONTENT); +// } +// +// @Log("删除YxWechatUser") +// @ApiOperation(value = "删除YxWechatUser") +// @DeleteMapping(value = "/yxWechatUser/{uid}") +// @PreAuthorize("hasAnyRole('ADMIN','YXWECHATUSER_ALL','YXWECHATUSER_DELETE')") +// public ResponseEntity delete(@PathVariable Integer uid){ +// yxWechatUserService.delete(uid); +// return new ResponseEntity(HttpStatus.OK); +// } +//} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/config/SwaggerConfiguration.java b/yshop-system/src/main/java/co/yixiang/config/SwaggerConfiguration.java new file mode 100644 index 00000000..6b8d9431 --- /dev/null +++ b/yshop-system/src/main/java/co/yixiang/config/SwaggerConfiguration.java @@ -0,0 +1,46 @@ +package co.yixiang.config; + +import org.springframework.beans.factory.annotation.Value; +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 { + @Value("${swagger.enabled}") + private Boolean enabled; + + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .enable(enabled) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("co.yixiang.modules")) + .paths(PathSelectors.any()) + .build(); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("yshop商城管理后台API") + .description("yshop商城管理后台API") + .termsOfServiceUrl("http://localhost:8000") + .contact("610796224@qq.com") + .version("1.6") + .build(); + } +} diff --git a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java index e753ff3f..24c3f4d7 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java @@ -1,6 +1,7 @@ package co.yixiang.modules.monitor.rest; import co.yixiang.annotation.Limit; +import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,6 +12,7 @@ import java.util.concurrent.atomic.AtomicInteger; * * 接口限流测试类 */ +@Api(tags = "接口限流测试类") @RestController @RequestMapping("api") public class LimitController { diff --git a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java index e5bde946..65fe9bf7 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java @@ -6,6 +6,7 @@ import co.yixiang.exception.BadRequestException; import co.yixiang.modules.monitor.service.RedisService; import co.yixiang.aop.log.Log; import co.yixiang.modules.monitor.domain.vo.RedisVo; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; * @author Zheng Jie * @date 2018-12-10 */ +@Api(tags = "redis缓存管理") @RestController @RequestMapping("api") public class RedisController { diff --git a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/VisitsController.java b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/VisitsController.java index a73aec69..0ef1e8ea 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/VisitsController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/VisitsController.java @@ -2,6 +2,7 @@ package co.yixiang.modules.monitor.rest; import co.yixiang.utils.RequestHolder; import co.yixiang.modules.monitor.service.VisitsService; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; * @author Zheng Jie * @date 2018-12-13 */ +@Api(tags = "访问统计") @RestController @RequestMapping("api") public class VisitsController { diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java index 7dbf36dd..7012866e 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.quartz.domain.QuartzJob; import co.yixiang.modules.quartz.service.QuartzJobService; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import co.yixiang.aop.log.Log; import co.yixiang.modules.quartz.service.dto.JobQueryCriteria; @@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*; @Slf4j @RestController @RequestMapping("/api") +@Api(tags = "定时任务") public class QuartzJobController { private static final String ENTITY_NAME = "quartzJob"; diff --git a/yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java b/yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java index fdf4f619..d691d30e 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/security/rest/AuthenticationController.java @@ -12,6 +12,7 @@ import co.yixiang.modules.security.utils.VerifyCodeUtils; import co.yixiang.utils.EncryptUtils; import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.StringUtils; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import co.yixiang.aop.log.Log; import co.yixiang.modules.security.security.ImgResult; @@ -35,6 +36,7 @@ import java.io.IOException; @Slf4j @RestController @RequestMapping("auth") +@Api(tags = "认证模块") public class AuthenticationController { @Value("${jwt.header}") diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java index 60c131a7..5e81f6be 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java @@ -8,6 +8,7 @@ import co.yixiang.modules.system.domain.Dept; import co.yixiang.modules.system.service.DeptService; import co.yixiang.modules.system.service.dto.DeptDTO; import co.yixiang.modules.system.service.dto.DeptQueryCriteria; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -22,6 +23,7 @@ import java.util.List; */ @RestController @RequestMapping("api") +@Api(tags = "部门管理") public class DeptController { @Autowired diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java index a9c03329..b51c5fad 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictController.java @@ -6,6 +6,7 @@ import co.yixiang.aop.log.Log; import co.yixiang.modules.system.domain.Dict; import co.yixiang.modules.system.service.DictService; import co.yixiang.modules.system.service.dto.DictQueryCriteria; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("api") +@Api(tags = "字典管理") public class DictController { @Autowired diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java index b78d71ec..fd6efd12 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java @@ -6,6 +6,7 @@ import co.yixiang.aop.log.Log; import co.yixiang.modules.system.domain.DictDetail; import co.yixiang.modules.system.service.DictDetailService; import co.yixiang.modules.system.service.dto.DictDetailQueryCriteria; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -25,6 +26,7 @@ import java.util.Map; */ @RestController @RequestMapping("api") +@Api(tags = "字典明细管理") public class DictDetailController { @Autowired diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java index 5b9493e5..06ec32d1 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/JobController.java @@ -7,6 +7,7 @@ import co.yixiang.aop.log.Log; import co.yixiang.modules.system.domain.Job; import co.yixiang.modules.system.service.JobService; import co.yixiang.modules.system.service.dto.JobQueryCriteria; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("api") +@Api(tags = "任务管理") public class JobController { @Autowired diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java index a60ff16e..1d031f41 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java @@ -12,6 +12,7 @@ import co.yixiang.modules.system.service.UserService; import co.yixiang.modules.system.service.dto.MenuDTO; import co.yixiang.modules.system.service.dto.MenuQueryCriteria; import co.yixiang.modules.system.service.dto.UserDTO; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -28,6 +29,7 @@ import java.util.Set; */ @RestController @RequestMapping("api") +@Api(tags = "菜单管理") public class MenuController { @Autowired diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/PermissionController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/PermissionController.java index e9d7b5b1..f012bd2d 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/PermissionController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/PermissionController.java @@ -9,6 +9,7 @@ import co.yixiang.modules.system.service.PermissionService; import co.yixiang.modules.system.service.dto.PermissionDTO; import co.yixiang.modules.system.service.dto.PermissionQueryCriteria; import co.yixiang.modules.system.service.mapper.PermissionMapper; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -26,6 +27,7 @@ import java.util.Set; */ @RestController @RequestMapping("api") +@Api(tags = "权限管理") public class PermissionController { @Autowired diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java index 03b8a709..1a8f0e49 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java @@ -11,6 +11,7 @@ import co.yixiang.modules.system.domain.Role; import co.yixiang.modules.system.service.RoleService; import co.yixiang.modules.system.service.dto.RoleQueryCriteria; import co.yixiang.modules.system.service.dto.RoleSmallDTO; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -30,6 +31,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("api") +@Api(tags = "角色管理") public class RoleController { @Autowired diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java index 011e7efa..26f8aa4f 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java @@ -20,6 +20,7 @@ import co.yixiang.modules.system.service.dto.RoleSmallDTO; import co.yixiang.modules.system.service.dto.UserQueryCriteria; import co.yixiang.utils.*; import co.yixiang.modules.system.service.UserService; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -42,6 +43,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("api") +@Api(tags = "系统用户管理") public class UserController { @Autowired diff --git a/yshop-tools/src/main/java/co/yixiang/rest/AliPayController.java b/yshop-tools/src/main/java/co/yixiang/rest/AliPayController.java index dfbf3354..1028a475 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/AliPayController.java +++ b/yshop-tools/src/main/java/co/yixiang/rest/AliPayController.java @@ -1,5 +1,6 @@ package co.yixiang.rest; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import co.yixiang.aop.log.Log; @@ -25,6 +26,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("/api") +@Api(tags = "支付宝支付") public class AliPayController { @Autowired diff --git a/yshop-tools/src/main/java/co/yixiang/rest/EmailController.java b/yshop-tools/src/main/java/co/yixiang/rest/EmailController.java index b585af25..e44edc72 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/EmailController.java +++ b/yshop-tools/src/main/java/co/yixiang/rest/EmailController.java @@ -1,5 +1,6 @@ package co.yixiang.rest; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import co.yixiang.aop.log.Log; import co.yixiang.domain.EmailConfig; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*; @Slf4j @RestController @RequestMapping("api") +@Api(tags = "邮件") public class EmailController { @Autowired diff --git a/yshop-tools/src/main/java/co/yixiang/rest/PictureController.java b/yshop-tools/src/main/java/co/yixiang/rest/PictureController.java index ef95927a..8bc2db79 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/PictureController.java +++ b/yshop-tools/src/main/java/co/yixiang/rest/PictureController.java @@ -5,6 +5,7 @@ import co.yixiang.domain.Picture; import co.yixiang.service.PictureService; import co.yixiang.service.dto.PictureQueryCriteria; import co.yixiang.utils.SecurityUtils; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -21,6 +22,7 @@ import java.util.Map; */ @RestController @RequestMapping("/api") +@Api(tags = "图床") public class PictureController { @Autowired diff --git a/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java b/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java index 29690481..245f7ec6 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java +++ b/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.exception.BadRequestException; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import co.yixiang.aop.log.Log; import co.yixiang.domain.QiniuConfig; @@ -28,6 +29,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("api") +@Api(tags = "七牛") public class QiniuController { @Autowired diff --git a/yshop-tools/src/main/java/co/yixiang/rest/VerificationCodeController.java b/yshop-tools/src/main/java/co/yixiang/rest/VerificationCodeController.java index 8d576614..cf5cd925 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/VerificationCodeController.java +++ b/yshop-tools/src/main/java/co/yixiang/rest/VerificationCodeController.java @@ -5,6 +5,7 @@ import co.yixiang.domain.vo.EmailVo; import co.yixiang.service.EmailService; import co.yixiang.service.VerificationCodeService; import co.yixiang.utils.ElAdminConstant; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("api") +@Api(tags = "验证") public class VerificationCodeController { @Autowired