diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index cd348d3c..cc05edb5 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 3.2.0 + 3.3.0 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 2ff4b64d..88a61dc3 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 49f20495..36fe9a44 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index f1d835cb..7a8ed1a4 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 350af894..42f58c3c 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm b/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm index 58762e2d..ef6773e1 100644 --- a/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm +++ b/blade-ops/blade-develop/src/main/resources/templates/controller.java.vm @@ -17,8 +17,8 @@ package $!{package.Controller}; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import javax.validation.Valid; @@ -35,14 +35,15 @@ import $!{package.Entity}.$!{entity}; #set($voPackage=$package.Entity.replace("entity","vo")) import $!{voPackage}.$!{entity}VO; #set($wrapperPackage=$package.Entity.replace("entity","wrapper")) +#if($!{cfg.hasWrapper}) import $!{wrapperPackage}.$!{entity}Wrapper; +#end import $!{package.Service}.$!{table.serviceName}; #if($!{superControllerClassPackage}) import $!{superControllerClassPackage}; #end #if(!$!{superEntityClass}) #end -import java.util.List; /** * $!{table.comment} 控制器 @@ -52,7 +53,7 @@ import java.util.List; */ @RestController @AllArgsConstructor -@RequestMapping("#if($!{package.ModuleName})/$!{package.ModuleName}#end/$!{cfg.entityKey}") +@RequestMapping("#if($!{package.ModuleName})$!{package.ModuleName}#end/$!{entityKey}") @Api(value = "$!{table.comment}", tags = "$!{table.comment}接口") #if($!{superControllerClass}) public class $!{table.controllerName} extends $!{superControllerClass} { @@ -62,11 +63,12 @@ public class $!{table.controllerName} { private $!{table.serviceName} $!{table.entityPath}Service; +#if($!{cfg.hasWrapper}) /** - * 详情 - */ + * 详情 + */ @GetMapping("/detail") - @ApiOperationSupport(order = 1) + @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入$!{table.entityPath}") public R<$!{entity}VO> detail($!{entity} $!{table.entityPath}) { $!{entity} detail = $!{table.entityPath}Service.getOne(Condition.getQueryWrapper($!{table.entityPath})); @@ -74,21 +76,45 @@ public class $!{table.controllerName} { } /** - * 分页 $!{table.comment} - */ + * 分页 $!{table.comment} + */ @GetMapping("/list") - @ApiOperationSupport(order = 2) + @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入$!{table.entityPath}") public R> list($!{entity} $!{table.entityPath}, Query query) { IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath})); return R.data($!{entity}Wrapper.build().pageVO(pages)); } +#else /** - * 自定义分页 $!{table.comment} - */ + * 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入$!{table.entityPath}") + public R<$!{entity}> detail($!{entity} $!{table.entityPath}) { + $!{entity} detail = $!{table.entityPath}Service.getOne(Condition.getQueryWrapper($!{table.entityPath})); + return R.data(detail); + } + + /** + * 分页 $!{table.comment} + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入$!{table.entityPath}") + public R> list($!{entity} $!{table.entityPath}, Query query) { + IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath})); + return R.data(pages); + } +#end + + /** + * 自定义分页 $!{table.comment} + */ @GetMapping("/page") - @ApiOperationSupport(order = 3) + @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入$!{table.entityPath}") public R> page($!{entity}VO $!{table.entityPath}, Query query) { IPage<$!{entity}VO> pages = $!{table.entityPath}Service.select$!{entity}Page(Condition.getPage(query), $!{table.entityPath}); @@ -96,30 +122,30 @@ public class $!{table.controllerName} { } /** - * 新增 $!{table.comment} - */ + * 新增 $!{table.comment} + */ @PostMapping("/save") - @ApiOperationSupport(order = 4) + @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入$!{table.entityPath}") public R save(@Valid @RequestBody $!{entity} $!{table.entityPath}) { return R.status($!{table.entityPath}Service.save($!{table.entityPath})); } /** - * 修改 $!{table.comment} - */ + * 修改 $!{table.comment} + */ @PostMapping("/update") - @ApiOperationSupport(order = 5) + @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入$!{table.entityPath}") public R update(@Valid @RequestBody $!{entity} $!{table.entityPath}) { return R.status($!{table.entityPath}Service.updateById($!{table.entityPath})); } /** - * 新增或修改 $!{table.comment} - */ + * 新增或修改 $!{table.comment} + */ @PostMapping("/submit") - @ApiOperationSupport(order = 6) + @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入$!{table.entityPath}") public R submit(@Valid @RequestBody $!{entity} $!{table.entityPath}) { return R.status($!{table.entityPath}Service.saveOrUpdate($!{table.entityPath})); @@ -128,10 +154,10 @@ public class $!{table.controllerName} { #if($!{superEntityClass}) /** - * 删除 $!{table.comment} - */ + * 删除 $!{table.comment} + */ @PostMapping("/remove") - @ApiOperationSupport(order = 7) + @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status($!{table.entityPath}Service.deleteLogic(Func.toLongList(ids))); @@ -140,10 +166,10 @@ public class $!{table.controllerName} { #else /** - * 删除 $!{table.comment} - */ + * 删除 $!{table.comment} + */ @PostMapping("/remove") - @ApiOperationSupport(order = 7) + @ApiOperationSupport(order = 8) @ApiOperation(value = "删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status($!{table.entityPath}Service.removeByIds(Func.toLongList(ids))); diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index 99ed51dd..be71692b 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-ops - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 6d2f36aa..08a27d1e 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml index 0a7e5e30..4a45735a 100644 --- a/blade-ops/blade-seata-order/pom.xml +++ b/blade-ops/blade-seata-order/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml index 97c0ef10..e9ff6756 100644 --- a/blade-ops/blade-seata-storage/pom.xml +++ b/blade-ops/blade-seata-storage/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index 695223e6..70c1c701 100644 --- a/blade-ops/blade-swagger/pom.xml +++ b/blade-ops/blade-swagger/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 2c8ddc04..a87d1130 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 3.2.0 + 3.3.0 4.0.0 blade-ops ${project.artifactId} - 3.2.0 + 3.3.0 pom blade-admin diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 2fca853d..97942761 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 - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 92587273..b20ea5fe 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index bde6b399..1ddb6fe2 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service-api/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml index 43487bdd..3ab8ebce 100644 --- a/blade-service-api/blade-scope-api/pom.xml +++ b/blade-service-api/blade-scope-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index c788723f..b52ef59f 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index b7a50bb0..79672c9d 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 617c26eb..508a66a0 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 3.2.0 + 3.3.0 4.0.0 blade-service-api ${project.artifactId} - 3.2.0 + 3.3.0 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index 8c52f703..e05b386b 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index f7304c99..28504c52 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index 67e8c3b0..c5979ca4 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 201430b7..d3974a62 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index 2841e8c7..3e231140 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.2.0 + 3.3.0 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index d3d807f9..6b992759 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade SpringBlade - 3.2.0 + 3.3.0 blade-service ${project.artifactId} - 3.2.0 + 3.3.0 pom SpringBlade 微服务集合 diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index e2d38648..299418cb 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -69,7 +69,7 @@ knife4j: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 3.2.0 + version: 3.3.0 license: Powered By SpringBlade licenseUrl: https://bladex.vip terms-of-service-url: https://bladex.vip diff --git a/pom.xml b/pom.xml index 994a15ef..500a0da4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade SpringBlade - 3.2.0 + 3.3.0 pom - 3.2.0 - 3.2.0 + 3.3.0 + 3.3.0 1.8 3.8.1 @@ -21,13 +21,13 @@ 1.6.2 2.2.6 1.2.5 - 2021.1 - 2.0.3 - 2.5.3 + 2021.0.1.0 + 2.0.4 + 2.6.2 2.0.0.RELEASE - 2.5.6 - 2020.0.4 + 2.6.3 + 2021.0.1 Cairo-SR8 diff --git a/script/docker/.env b/script/docker/.env index 8cece65f..b5dfd3df 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=3.2.0 +TAG=3.3.0 diff --git a/script/kuboard/kuboard_spring-blade.yaml b/script/kuboard/kuboard_spring-blade.yaml index 6d5766e2..c28731cb 100644 --- a/script/kuboard/kuboard_spring-blade.yaml +++ b/script/kuboard/kuboard_spring-blade.yaml @@ -152,7 +152,7 @@ spec: spec: containers: - name: blade-admin - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -386,7 +386,7 @@ spec: spec: containers: - name: blade-auth - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -625,7 +625,7 @@ spec: spec: containers: - name: blade-desk - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -864,7 +864,7 @@ spec: spec: containers: - name: blade-develop - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -1096,7 +1096,7 @@ spec: spec: containers: - name: blade-gateway - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -1331,7 +1331,7 @@ spec: spec: containers: - name: blade-log - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -1565,7 +1565,7 @@ spec: spec: containers: - name: blade-report - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -1799,7 +1799,7 @@ spec: spec: containers: - name: blade-resource - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -2033,7 +2033,7 @@ spec: spec: containers: - name: blade-system - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -2267,7 +2267,7 @@ spec: spec: containers: - name: blade-user - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -2496,7 +2496,7 @@ spec: spec: containers: - name: saber-web - image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.3.0' ports: - name: web containerPort: 80 @@ -2721,7 +2721,7 @@ spec: spec: containers: - name: blade-swagger - image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.3.0' args: - '--spring.profiles.active=${PROFILE}' - '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}' @@ -3749,7 +3749,7 @@ spec: spec: containers: - name: mysql - image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.2.0' + image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.3.0' ports: - name: mysql containerPort: 3306