diff --git a/blade-common/pom.xml b/blade-common/pom.xml index c27c7ee4d..684d773a4 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 diff --git a/blade-example-api/blade-dubbo-provider-api/pom.xml b/blade-example-api/blade-dubbo-provider-api/pom.xml index 99314cb49..664abe560 100644 --- a/blade-example-api/blade-dubbo-provider-api/pom.xml +++ b/blade-example-api/blade-dubbo-provider-api/pom.xml @@ -5,7 +5,7 @@ blade-example-api org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 diff --git a/blade-example-api/pom.xml b/blade-example-api/pom.xml index 1bbaf0ece..35287bd0f 100644 --- a/blade-example-api/pom.xml +++ b/blade-example-api/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 blade-example-api ${project.artifactId} - 2.0.3.RELEASE + 2.0.5.RELEASE pom BladeX 微服务范例API集合 diff --git a/blade-example/blade-dubbo-consumer/pom.xml b/blade-example/blade-dubbo-consumer/pom.xml index 688a2df1f..c562282c0 100644 --- a/blade-example/blade-dubbo-consumer/pom.xml +++ b/blade-example/blade-dubbo-consumer/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 diff --git a/blade-example/blade-dubbo-provider/pom.xml b/blade-example/blade-dubbo-provider/pom.xml index b6da8e66f..d80220504 100644 --- a/blade-example/blade-dubbo-provider/pom.xml +++ b/blade-example/blade-dubbo-provider/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 diff --git a/blade-example/pom.xml b/blade-example/pom.xml index 6a7917873..a484038aa 100644 --- a/blade-example/pom.xml +++ b/blade-example/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 blade-example ${project.artifactId} - 2.0.3.RELEASE + 2.0.5.RELEASE pom BladeX 微服务范例集合 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index b700010a8..4a17f13d5 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 5aba76af3..8ae16f331 100644 --- a/blade-service-api/blade-demo-api/pom.xml +++ b/blade-service-api/blade-demo-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 353c92b7d..6e640778d 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,14 +5,14 @@ BladeX-Biz org.springblade - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.0.3.RELEASE + 2.0.5.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index cb7328a9e..de6e7d066 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.0.3.RELEASE + 2.0.5.RELEASE 4.0.0 diff --git a/blade-service/blade-demo/src/main/java/com/example/demo/controller/NoticeController.java b/blade-service/blade-demo/src/main/java/com/example/demo/controller/NoticeController.java index f9e4b9fd4..50d901bb4 100644 --- a/blade-service/blade-demo/src/main/java/com/example/demo/controller/NoticeController.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/controller/NoticeController.java @@ -49,7 +49,8 @@ public class NoticeController extends BladeController implements CacheNames { * 详情 */ @GetMapping("/detail") - @ApiOperation(value = "详情", notes = "传入notice", position = 1) + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入notice") public R detail(Notice notice) { Notice detail = noticeService.getOne(Condition.getQueryWrapper(notice)); return R.data(detail); @@ -63,7 +64,8 @@ public class NoticeController extends BladeController implements CacheNames { @ApiImplicitParam(name = "category", value = "公告类型", paramType = "query", dataType = "integer"), @ApiImplicitParam(name = "title", value = "公告标题", paramType = "query", dataType = "string") }) - @ApiOperation(value = "分页", notes = "传入notice", position = 2) + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入notice") public R> list(@ApiIgnore @RequestParam Map notice, Query query) { IPage pages = noticeService.page(Condition.getPage(query), Condition.getQueryWrapper(notice, Notice.class)); return R.data(pages); @@ -73,7 +75,8 @@ public class NoticeController extends BladeController implements CacheNames { * 新增 */ @PostMapping("/save") - @ApiOperation(value = "新增", notes = "传入notice", position = 3) + @ApiOperationSupport(order = 3) + @ApiOperation(value = "新增", notes = "传入notice") public R save(@RequestBody Notice notice) { return R.status(noticeService.save(notice)); } @@ -82,7 +85,8 @@ public class NoticeController extends BladeController implements CacheNames { * 修改 */ @PostMapping("/update") - @ApiOperation(value = "修改", notes = "传入notice", position = 4) + @ApiOperationSupport(order = 4) + @ApiOperation(value = "修改", notes = "传入notice") public R update(@RequestBody Notice notice) { return R.status(noticeService.updateById(notice)); } @@ -91,7 +95,8 @@ public class NoticeController extends BladeController implements CacheNames { * 新增或修改 */ @PostMapping("/submit") - @ApiOperation(value = "新增或修改", notes = "传入notice", position = 5) + @ApiOperationSupport(order = 5) + @ApiOperation(value = "新增或修改", notes = "传入notice") public R submit(@RequestBody Notice notice) { return R.status(noticeService.saveOrUpdate(notice)); } @@ -100,7 +105,8 @@ public class NoticeController extends BladeController implements CacheNames { * 删除 */ @PostMapping("/remove") - @ApiOperation(value = "逻辑删除", notes = "传入notice", position = 6) + @ApiOperationSupport(order = 6) + @ApiOperation(value = "逻辑删除", notes = "传入notice") public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { boolean temp = noticeService.deleteLogic(Func.toLongList(ids)); return R.status(temp); diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 4b04d7322..915506200 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade BladeX-Biz - 2.0.3.RELEASE + 2.0.5.RELEASE blade-service ${project.artifactId} - 2.0.3.RELEASE + 2.0.5.RELEASE pom BladeX 微服务集合 diff --git a/pom.xml b/pom.xml index ec0332118..a9ff9155e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade BladeX-Biz - 2.0.3.RELEASE + 2.0.5.RELEASE pom - 2.0.3.RELEASE - 2.0.3.RELEASE + 2.0.5.RELEASE + 2.0.5.RELEASE 1.8 2.9.2 @@ -26,8 +26,8 @@ 0.9.0.RELEASE 2.7.1 - 2.1.5.RELEASE - Greenwich.SR1 + 2.1.6.RELEASE + Greenwich.SR2 Cairo-SR7 diff --git a/script/docker/.env b/script/docker/.env index e52177ea7..659cceb25 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.0.3.RELEASE +TAG=2.0.5.RELEASE