mirror of
https://github.com/chillzhuang/SpringBlade.git
synced 2024-11-21 18:09:25 +08:00
🎉 3.3.1.RELEASE 升级适配代码生成器API
This commit is contained in:
parent
4d2e706fcb
commit
fc1ddb4a11
@ -1,9 +1,9 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<img src="https://img.shields.io/badge/Release-V3.3.0-green.svg" alt="Downloads">
|
<img src="https://img.shields.io/badge/Release-V3.3.1-green.svg" alt="Downloads">
|
||||||
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status">
|
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status">
|
||||||
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
|
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
|
||||||
<img src="https://img.shields.io/badge/Spring%20Cloud-2021-blue.svg" alt="Coverage Status">
|
<img src="https://img.shields.io/badge/Spring%20Cloud-2021-blue.svg" alt="Coverage Status">
|
||||||
<img src="https://img.shields.io/badge/Spring%20Boot-2.6.3-blue.svg" alt="Downloads">
|
<img src="https://img.shields.io/badge/Spring%20Boot-2.6.6-blue.svg" alt="Downloads">
|
||||||
<a target="_blank" href="https://bladex.vip">
|
<a target="_blank" href="https://bladex.vip">
|
||||||
<img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads">
|
<img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads">
|
||||||
</a>
|
</a>
|
||||||
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
## SpringBlade微服务开发平台
|
## SpringBlade微服务开发平台
|
||||||
* 采用前后端分离的模式,前端开源两个框架:[Sword](https://gitee.com/smallc/Sword) (基于 React、Ant Design)、[Saber](https://gitee.com/smallc/Saber) (基于 Vue、Element-UI)
|
* 采用前后端分离的模式,前端开源两个框架:[Sword](https://gitee.com/smallc/Sword) (基于 React、Ant Design)、[Saber](https://gitee.com/smallc/Saber) (基于 Vue、Element-UI)
|
||||||
* 后端采用SpringCloud全家桶,并同时对其基础组件做了高度的封装,单独开源出一个框架:[BladeTool](https://github.com/chillzhuang/blade-tool)
|
* 后端采用SpringCloud全家桶,并同时对其基础组件做了高度的封装,单独开源出一个框架:[BladeTool](https://gitee.com/smallc/blade-tool)
|
||||||
* [BladeTool](https://github.com/chillzhuang/blade-tool)已推送至Maven中央库,直接引入即可,减少了工程的臃肿,也可更注重于业务开发
|
* [BladeTool](https://github.com/chillzhuang/blade-tool)已推送至Maven中央库,直接引入即可,减少了工程的臃肿,也可更注重于业务开发
|
||||||
* 集成Sentinel从流量控制、熔断降级、系统负载等多个维度保护服务的稳定性。
|
* 集成Sentinel从流量控制、熔断降级、系统负载等多个维度保护服务的稳定性。
|
||||||
* 注册中心、配置中心选型Nacos,为工程瘦身的同时加强各模块之间的联动。
|
* 注册中心、配置中心选型Nacos,为工程瘦身的同时加强各模块之间的联动。
|
||||||
@ -83,7 +83,7 @@ SpringBlade
|
|||||||
* 后端SpringBoot版:[https://gitee.com/smallc/SpringBlade/tree/boot/](https://gitee.com/smallc/SpringBlade/tree/boot/)
|
* 后端SpringBoot版:[https://gitee.com/smallc/SpringBlade/tree/boot/](https://gitee.com/smallc/SpringBlade/tree/boot/)
|
||||||
* 前端框架Sword(基于React):[https://gitee.com/smallc/Sword](https://gitee.com/smallc/Sword)
|
* 前端框架Sword(基于React):[https://gitee.com/smallc/Sword](https://gitee.com/smallc/Sword)
|
||||||
* 前端框架Saber(基于Vue):[https://gitee.com/smallc/Saber](https://gitee.com/smallc/Saber)
|
* 前端框架Saber(基于Vue):[https://gitee.com/smallc/Saber](https://gitee.com/smallc/Saber)
|
||||||
* 核心框架项目地址:[https://github.com/chillzhuang/blade-tool](https://github.com/chillzhuang/blade-tool)
|
* 核心框架项目地址:[https://gitee.com/smallc/blade-tool](https://gitee.com/smallc/blade-tool)
|
||||||
|
|
||||||
# 开源协议
|
# 开源协议
|
||||||
Apache Licence 2.0 ([英文原文](http://www.apache.org/licenses/LICENSE-2.0.html))
|
Apache Licence 2.0 ([英文原文](http://www.apache.org/licenses/LICENSE-2.0.html))
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>SpringBlade</artifactId>
|
<artifactId>SpringBlade</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>blade-auth</artifactId>
|
<artifactId>blade-auth</artifactId>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>SpringBlade</artifactId>
|
<artifactId>SpringBlade</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>SpringBlade</artifactId>
|
<artifactId>SpringBlade</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-ops</artifactId>
|
<artifactId>blade-ops</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<artifactId>blade-ops</artifactId>
|
<artifactId>blade-ops</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
/**
|
/**
|
||||||
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
|
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
|
||||||
* <p>
|
* <p>
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
* You may obtain a copy of the License at
|
||||||
* <p>
|
* <p>
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.gnu.org/licenses/lgpl.html
|
||||||
* <p>
|
* <p>
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
@ -35,7 +35,7 @@ import $!{package.Entity}.$!{entity};
|
|||||||
#set($voPackage=$package.Entity.replace("entity","vo"))
|
#set($voPackage=$package.Entity.replace("entity","vo"))
|
||||||
import $!{voPackage}.$!{entity}VO;
|
import $!{voPackage}.$!{entity}VO;
|
||||||
#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
|
#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
|
||||||
#if($!{cfg.hasWrapper})
|
#if($!{hasWrapper})
|
||||||
import $!{wrapperPackage}.$!{entity}Wrapper;
|
import $!{wrapperPackage}.$!{entity}Wrapper;
|
||||||
#end
|
#end
|
||||||
import $!{package.Service}.$!{table.serviceName};
|
import $!{package.Service}.$!{table.serviceName};
|
||||||
@ -63,7 +63,7 @@ public class $!{table.controllerName} {
|
|||||||
|
|
||||||
private $!{table.serviceName} $!{table.entityPath}Service;
|
private $!{table.serviceName} $!{table.entityPath}Service;
|
||||||
|
|
||||||
#if($!{cfg.hasWrapper})
|
#if($!{hasWrapper})
|
||||||
/**
|
/**
|
||||||
* 详情
|
* 详情
|
||||||
*/
|
*/
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
/**
|
/**
|
||||||
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
|
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
|
||||||
* <p>
|
* <p>
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
* You may obtain a copy of the License at
|
||||||
* <p>
|
* <p>
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.gnu.org/licenses/lgpl.html
|
||||||
* <p>
|
* <p>
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
@ -17,8 +17,8 @@ package $!{package.Controller};
|
|||||||
|
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
||||||
import io.swagger.annotations.ApiParam;
|
import io.swagger.annotations.ApiParam;
|
||||||
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
|
|
||||||
@ -35,14 +35,15 @@ import $!{package.Entity}.$!{entity};
|
|||||||
#set($voPackage=$package.Entity.replace("entity","vo"))
|
#set($voPackage=$package.Entity.replace("entity","vo"))
|
||||||
import $!{voPackage}.$!{entity}VO;
|
import $!{voPackage}.$!{entity}VO;
|
||||||
#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
|
#set($wrapperPackage=$package.Entity.replace("entity","wrapper"))
|
||||||
|
#if($!{hasWrapper})
|
||||||
import $!{wrapperPackage}.$!{entity}Wrapper;
|
import $!{wrapperPackage}.$!{entity}Wrapper;
|
||||||
|
#end
|
||||||
import $!{package.Service}.$!{table.serviceName};
|
import $!{package.Service}.$!{table.serviceName};
|
||||||
#if($!{superControllerClassPackage})
|
#if($!{superControllerClassPackage})
|
||||||
import $!{superControllerClassPackage};
|
import $!{superControllerClassPackage};
|
||||||
#end
|
#end
|
||||||
#if(!$!{superEntityClass})
|
#if(!$!{superEntityClass})
|
||||||
#end
|
#end
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* $!{table.comment} 控制器
|
* $!{table.comment} 控制器
|
||||||
@ -52,7 +53,7 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@AllArgsConstructor
|
@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}接口")
|
@Api(value = "$!{table.comment}", tags = "$!{table.comment}接口")
|
||||||
#if($!{superControllerClass})
|
#if($!{superControllerClass})
|
||||||
public class $!{table.controllerName} extends $!{superControllerClass} {
|
public class $!{table.controllerName} extends $!{superControllerClass} {
|
||||||
@ -62,11 +63,12 @@ public class $!{table.controllerName} {
|
|||||||
|
|
||||||
private $!{table.serviceName} $!{table.entityPath}Service;
|
private $!{table.serviceName} $!{table.entityPath}Service;
|
||||||
|
|
||||||
|
#if($!{hasWrapper})
|
||||||
/**
|
/**
|
||||||
* 详情
|
* 详情
|
||||||
*/
|
*/
|
||||||
@GetMapping("/detail")
|
@GetMapping("/detail")
|
||||||
@ApiOperationSupport(order = 1)
|
@ApiOperationSupport(order = 1)
|
||||||
@ApiOperation(value = "详情", notes = "传入$!{table.entityPath}")
|
@ApiOperation(value = "详情", notes = "传入$!{table.entityPath}")
|
||||||
public R<$!{entity}VO> detail($!{entity} $!{table.entityPath}) {
|
public R<$!{entity}VO> detail($!{entity} $!{table.entityPath}) {
|
||||||
$!{entity} detail = $!{table.entityPath}Service.getOne(Condition.getQueryWrapper($!{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")
|
@GetMapping("/list")
|
||||||
@ApiOperationSupport(order = 2)
|
@ApiOperationSupport(order = 2)
|
||||||
@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
|
@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
|
||||||
public R<IPage<$!{entity}VO>> list($!{entity} $!{table.entityPath}, Query query) {
|
public R<IPage<$!{entity}VO>> list($!{entity} $!{table.entityPath}, Query query) {
|
||||||
IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath}));
|
IPage<$!{entity}> pages = $!{table.entityPath}Service.page(Condition.getPage(query), Condition.getQueryWrapper($!{table.entityPath}));
|
||||||
return R.data($!{entity}Wrapper.build().pageVO(pages));
|
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<IPage<$!{entity}>> 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")
|
@GetMapping("/page")
|
||||||
@ApiOperationSupport(order = 3)
|
@ApiOperationSupport(order = 3)
|
||||||
@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
|
@ApiOperation(value = "分页", notes = "传入$!{table.entityPath}")
|
||||||
public R<IPage<$!{entity}VO>> page($!{entity}VO $!{table.entityPath}, Query query) {
|
public R<IPage<$!{entity}VO>> page($!{entity}VO $!{table.entityPath}, Query query) {
|
||||||
IPage<$!{entity}VO> pages = $!{table.entityPath}Service.select$!{entity}Page(Condition.getPage(query), $!{table.entityPath});
|
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")
|
@PostMapping("/save")
|
||||||
@ApiOperationSupport(order = 4)
|
@ApiOperationSupport(order = 4)
|
||||||
@ApiOperation(value = "新增", notes = "传入$!{table.entityPath}")
|
@ApiOperation(value = "新增", notes = "传入$!{table.entityPath}")
|
||||||
public R save(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
|
public R save(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
|
||||||
return R.status($!{table.entityPath}Service.save($!{table.entityPath}));
|
return R.status($!{table.entityPath}Service.save($!{table.entityPath}));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改 $!{table.comment}
|
* 修改 $!{table.comment}
|
||||||
*/
|
*/
|
||||||
@PostMapping("/update")
|
@PostMapping("/update")
|
||||||
@ApiOperationSupport(order = 5)
|
@ApiOperationSupport(order = 5)
|
||||||
@ApiOperation(value = "修改", notes = "传入$!{table.entityPath}")
|
@ApiOperation(value = "修改", notes = "传入$!{table.entityPath}")
|
||||||
public R update(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
|
public R update(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
|
||||||
return R.status($!{table.entityPath}Service.updateById($!{table.entityPath}));
|
return R.status($!{table.entityPath}Service.updateById($!{table.entityPath}));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增或修改 $!{table.comment}
|
* 新增或修改 $!{table.comment}
|
||||||
*/
|
*/
|
||||||
@PostMapping("/submit")
|
@PostMapping("/submit")
|
||||||
@ApiOperationSupport(order = 6)
|
@ApiOperationSupport(order = 6)
|
||||||
@ApiOperation(value = "新增或修改", notes = "传入$!{table.entityPath}")
|
@ApiOperation(value = "新增或修改", notes = "传入$!{table.entityPath}")
|
||||||
public R submit(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
|
public R submit(@Valid @RequestBody $!{entity} $!{table.entityPath}) {
|
||||||
return R.status($!{table.entityPath}Service.saveOrUpdate($!{table.entityPath}));
|
return R.status($!{table.entityPath}Service.saveOrUpdate($!{table.entityPath}));
|
||||||
@ -128,10 +154,10 @@ public class $!{table.controllerName} {
|
|||||||
#if($!{superEntityClass})
|
#if($!{superEntityClass})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除 $!{table.comment}
|
* 删除 $!{table.comment}
|
||||||
*/
|
*/
|
||||||
@PostMapping("/remove")
|
@PostMapping("/remove")
|
||||||
@ApiOperationSupport(order = 7)
|
@ApiOperationSupport(order = 7)
|
||||||
@ApiOperation(value = "逻辑删除", notes = "传入ids")
|
@ApiOperation(value = "逻辑删除", notes = "传入ids")
|
||||||
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
|
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
|
||||||
return R.status($!{table.entityPath}Service.deleteLogic(Func.toLongList(ids)));
|
return R.status($!{table.entityPath}Service.deleteLogic(Func.toLongList(ids)));
|
||||||
@ -140,10 +166,10 @@ public class $!{table.controllerName} {
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除 $!{table.comment}
|
* 删除 $!{table.comment}
|
||||||
*/
|
*/
|
||||||
@PostMapping("/remove")
|
@PostMapping("/remove")
|
||||||
@ApiOperationSupport(order = 7)
|
@ApiOperationSupport(order = 8)
|
||||||
@ApiOperation(value = "删除", notes = "传入ids")
|
@ApiOperation(value = "删除", notes = "传入ids")
|
||||||
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
|
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
|
||||||
return R.status($!{table.entityPath}Service.removeByIds(Func.toLongList(ids)));
|
return R.status($!{table.entityPath}Service.removeByIds(Func.toLongList(ids)));
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<artifactId>blade-ops</artifactId>
|
<artifactId>blade-ops</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-ops</artifactId>
|
<artifactId>blade-ops</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-ops</artifactId>
|
<artifactId>blade-ops</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-ops</artifactId>
|
<artifactId>blade-ops</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-ops</artifactId>
|
<artifactId>blade-ops</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,13 +5,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>SpringBlade</artifactId>
|
<artifactId>SpringBlade</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>blade-ops</artifactId>
|
<artifactId>blade-ops</artifactId>
|
||||||
<name>${project.artifactId}</name>
|
<name>${project.artifactId}</name>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<modules>
|
<modules>
|
||||||
<module>blade-admin</module>
|
<module>blade-admin</module>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service-api</artifactId>
|
<artifactId>blade-service-api</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service-api</artifactId>
|
<artifactId>blade-service-api</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service-api</artifactId>
|
<artifactId>blade-service-api</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service-api</artifactId>
|
<artifactId>blade-service-api</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service-api</artifactId>
|
<artifactId>blade-service-api</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service-api</artifactId>
|
<artifactId>blade-service-api</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,13 +5,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>SpringBlade</artifactId>
|
<artifactId>SpringBlade</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>blade-service-api</artifactId>
|
<artifactId>blade-service-api</artifactId>
|
||||||
<name>${project.artifactId}</name>
|
<name>${project.artifactId}</name>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<description>SpringBlade 微服务API集合</description>
|
<description>SpringBlade 微服务API集合</description>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service</artifactId>
|
<artifactId>blade-service</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<artifactId>blade-service</artifactId>
|
<artifactId>blade-service</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service</artifactId>
|
<artifactId>blade-service</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service</artifactId>
|
<artifactId>blade-service</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>blade-service</artifactId>
|
<artifactId>blade-service</artifactId>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -7,12 +7,12 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<artifactId>SpringBlade</artifactId>
|
<artifactId>SpringBlade</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>blade-service</artifactId>
|
<artifactId>blade-service</artifactId>
|
||||||
<name>${project.artifactId}</name>
|
<name>${project.artifactId}</name>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<description>SpringBlade 微服务集合</description>
|
<description>SpringBlade 微服务集合</description>
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ knife4j:
|
|||||||
swagger:
|
swagger:
|
||||||
title: SpringBlade 接口文档系统
|
title: SpringBlade 接口文档系统
|
||||||
description: SpringBlade 接口文档系统
|
description: SpringBlade 接口文档系统
|
||||||
version: 3.3.0
|
version: 3.3.1
|
||||||
license: Powered By SpringBlade
|
license: Powered By SpringBlade
|
||||||
licenseUrl: https://bladex.vip
|
licenseUrl: https://bladex.vip
|
||||||
terms-of-service-url: https://bladex.vip
|
terms-of-service-url: https://bladex.vip
|
||||||
|
8
pom.xml
8
pom.xml
@ -5,12 +5,12 @@
|
|||||||
|
|
||||||
<groupId>org.springblade</groupId>
|
<groupId>org.springblade</groupId>
|
||||||
<artifactId>SpringBlade</artifactId>
|
<artifactId>SpringBlade</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<blade.tool.version>3.3.0</blade.tool.version>
|
<blade.tool.version>3.3.1</blade.tool.version>
|
||||||
<blade.project.version>3.3.0</blade.project.version>
|
<blade.project.version>3.3.1</blade.project.version>
|
||||||
|
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<maven.plugin.version>3.8.1</maven.plugin.version>
|
<maven.plugin.version>3.8.1</maven.plugin.version>
|
||||||
@ -26,7 +26,7 @@
|
|||||||
<spring.boot.admin.version>2.6.2</spring.boot.admin.version>
|
<spring.boot.admin.version>2.6.2</spring.boot.admin.version>
|
||||||
<spring.plugin.version>2.0.0.RELEASE</spring.plugin.version>
|
<spring.plugin.version>2.0.0.RELEASE</spring.plugin.version>
|
||||||
|
|
||||||
<spring.boot.version>2.6.3</spring.boot.version>
|
<spring.boot.version>2.6.6</spring.boot.version>
|
||||||
<spring.cloud.version>2021.0.1</spring.cloud.version>
|
<spring.cloud.version>2021.0.1</spring.cloud.version>
|
||||||
<spring.platform.version>Cairo-SR8</spring.platform.version>
|
<spring.platform.version>Cairo-SR8</spring.platform.version>
|
||||||
|
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
REGISTER=192.168.0.157/blade
|
REGISTER=192.168.0.157/blade
|
||||||
TAG=3.3.0
|
TAG=3.3.1
|
||||||
|
@ -152,7 +152,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-admin
|
- name: blade-admin
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -386,7 +386,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-auth
|
- name: blade-auth
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -625,7 +625,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-desk
|
- name: blade-desk
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -864,7 +864,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-develop
|
- name: blade-develop
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -1096,7 +1096,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-gateway
|
- name: blade-gateway
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -1331,7 +1331,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-log
|
- name: blade-log
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -1565,7 +1565,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-report
|
- name: blade-report
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -1799,7 +1799,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-resource
|
- name: blade-resource
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -2033,7 +2033,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-system
|
- name: blade-system
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -2267,7 +2267,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-user
|
- name: blade-user
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -2496,7 +2496,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: saber-web
|
- name: saber-web
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:3.3.1'
|
||||||
ports:
|
ports:
|
||||||
- name: web
|
- name: web
|
||||||
containerPort: 80
|
containerPort: 80
|
||||||
@ -2721,7 +2721,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: blade-swagger
|
- name: blade-swagger
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:3.3.1'
|
||||||
args:
|
args:
|
||||||
- '--spring.profiles.active=${PROFILE}'
|
- '--spring.profiles.active=${PROFILE}'
|
||||||
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
|
||||||
@ -3749,7 +3749,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mysql
|
- name: mysql
|
||||||
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.3.0'
|
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v3.3.1'
|
||||||
ports:
|
ports:
|
||||||
- name: mysql
|
- name: mysql
|
||||||
containerPort: 3306
|
containerPort: 3306
|
||||||
|
Loading…
Reference in New Issue
Block a user