Browse Source

🎉 升级依赖,优化swagger排序注解

test
smallchill 6 years ago
parent
commit
98a64c1e67
  1. 2
      blade-common/pom.xml
  2. 2
      blade-example-api/blade-dubbo-provider-api/pom.xml
  3. 4
      blade-example-api/pom.xml
  4. 2
      blade-example/blade-dubbo-consumer/pom.xml
  5. 2
      blade-example/blade-dubbo-provider/pom.xml
  6. 4
      blade-example/pom.xml
  7. 2
      blade-gateway/pom.xml
  8. 2
      blade-service-api/blade-demo-api/pom.xml
  9. 4
      blade-service-api/pom.xml
  10. 2
      blade-service/blade-demo/pom.xml
  11. 18
      blade-service/blade-demo/src/main/java/com/example/demo/controller/NoticeController.java
  12. 4
      blade-service/pom.xml
  13. 10
      pom.xml
  14. 2
      script/docker/.env

2
blade-common/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-example-api/blade-dubbo-provider-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-example-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-example-api/pom.xml

@ -5,13 +5,13 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-example-api</artifactId>
<name>${project.artifactId}</name>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务范例API集合</description>

2
blade-example/blade-dubbo-consumer/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-example/blade-dubbo-provider/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-example/pom.xml

@ -5,13 +5,13 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-example</artifactId>
<name>${project.artifactId}</name>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务范例集合</description>

2
blade-gateway/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-demo-api/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-service-api/pom.xml

@ -5,14 +5,14 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务API集合</description>

2
blade-service/blade-demo/pom.xml

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

18
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<Notice> 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<IPage<Notice>> list(@ApiIgnore @RequestParam Map<String, Object> notice, Query query) {
IPage<Notice> 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);

4
blade-service/pom.xml

@ -7,12 +7,12 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>BladeX-Biz</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
</parent>
<artifactId>blade-service</artifactId>
<name>${project.artifactId}</name>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务集合</description>

10
pom.xml

@ -5,12 +5,12 @@
<groupId>org.springblade</groupId>
<artifactId>BladeX-Biz</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.0.5.RELEASE</version>
<packaging>pom</packaging>
<properties>
<bladex.tool.version>2.0.3.RELEASE</bladex.tool.version>
<bladex.project.version>2.0.3.RELEASE</bladex.project.version>
<bladex.tool.version>2.0.5.RELEASE</bladex.tool.version>
<bladex.project.version>2.0.5.RELEASE</bladex.project.version>
<java.version>1.8</java.version>
<swagger.version>2.9.2</swagger.version>
@ -26,8 +26,8 @@
<alibaba.cloud.version>0.9.0.RELEASE</alibaba.cloud.version>
<dubbo.version>2.7.1</dubbo.version>
<spring.boot.version>2.1.5.RELEASE</spring.boot.version>
<spring.cloud.version>Greenwich.SR1</spring.cloud.version>
<spring.boot.version>2.1.6.RELEASE</spring.boot.version>
<spring.cloud.version>Greenwich.SR2</spring.cloud.version>
<spring.platform.version>Cairo-SR7</spring.platform.version>
<!-- 推荐使用Harbor -->

2
script/docker/.env

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
TAG=2.0.3.RELEASE
TAG=2.0.5.RELEASE

Loading…
Cancel
Save