mirror of
https://gitee.com/ChinaLym/shoulder-platform.git
synced 2025-12-30 02:52:27 +00:00
feat(version): shoulder->0.5
This commit is contained in:
15858193327
4206
doc/shoulder-platform.ddl
Normal file
4206
doc/shoulder-platform.ddl
Normal file
File diff suppressed because it is too large
Load Diff
@@ -21,7 +21,7 @@
|
||||
|
||||
|
||||
<properties>
|
||||
<shoulder.version>0.4</shoulder.version><!-- shoulder-version -->
|
||||
<shoulder.version>0.5-SNAPSHOT</shoulder.version><!-- shoulder-version -->
|
||||
<spring-boot.version>2.2.8.RELEASE</spring-boot.version>
|
||||
<spring-cloud.version>Hoxton.SR6</spring-cloud.version>
|
||||
<spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<name>${project.artifactId}</name>
|
||||
|
||||
<properties>
|
||||
<shoulder.version>0.4</shoulder.version><!-- shoulder-version -->
|
||||
<shoulder.version>0.5-SNAPSHOT</shoulder.version><!-- shoulder-version -->
|
||||
<spring-boot.version>2.2.8.RELEASE</spring-boot.version>
|
||||
<spring-cloud.version>Hoxton.SR6</spring-cloud.version>
|
||||
<spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>cn.itlym</groupId>
|
||||
<artifactId>shoulder-parent</artifactId>
|
||||
<version>0.4</version><!-- shoulder-version -->
|
||||
<version>0.5-SNAPSHOT</version><!-- shoulder-version -->
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -57,6 +57,7 @@ public class GeneratorApp {
|
||||
* ===========【 生成代码 】===========
|
||||
* web 中不需要主动关闭流
|
||||
* <a href="http://localhost:8080/generator/code?tables=_all">所有表生成代码</a>
|
||||
* <a href="http://localhost:8080/generator/code?tables=system_lock">所有表生成代码</a>
|
||||
* @param tables 表名，逗号分隔，_all 全部
|
||||
*/
|
||||
@RequestMapping("code")
|
||||
|
||||
@@ -40,8 +40,13 @@ public class ${className}Controller {
|
||||
#if(${checkAuth})
|
||||
@PreAuthorize("hasAnyAuthority('${tableName}:${pathName}:list')")
|
||||
#end
|
||||
public PageResult list(@RequestParam Map<String, Object> condition){
|
||||
return ${lowClassName}Service.findAll(condition);
|
||||
public PageResult<${className}> list(@RequestParam Map<String, Object> condition){
|
||||
PageInfo<${className}> pageInfo = new PageInfo<>(${lowClassName}Service.findAll(condition));
|
||||
|
||||
return PageResult.PageResultBuilder.aPageResult()
|
||||
.list(pageInfo.getList())
|
||||
.totalPageNum((int) pageInfo.getTotal())
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ public interface ${className}Service {
|
||||
* @param params 条件
|
||||
* @return 查询结果
|
||||
*/
|
||||
PageResult<${className}PO> findAll(Map<String, Object> params);
|
||||
List<${className}> findAll(Map<String, Object> params);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,6 @@ import java.util.stream.Collectors;
|
||||
|
||||
import org.apache.commons.collections4.MapUtils;
|
||||
|
||||
import org.shoulder.core.dto.response.PageResult;
|
||||
import ${package}.${pkgName}.dto.${className}DTO;
|
||||
import ${package}.${pkgName}.dao.${className}Mapper;
|
||||
import ${package}.${pkgName}.model.${className};
|
||||
import ${package}.${pkgName}.po.${className}PO;
|
||||
@@ -68,15 +66,9 @@ public class ${className}ServiceImpl implements ${className}Service {
|
||||
throw new RuntimeException("return empty...");
|
||||
//return PageResult.empty(0);
|
||||
}
|
||||
List<${className}> list = poList.stream()
|
||||
return poList.stream()
|
||||
.map(${className}Converter.CONVERTER::fromPO)
|
||||
.collect(Collectors.toList());
|
||||
PageInfo<${className}> pageInfo = new PageInfo<>(list);
|
||||
|
||||
return PageResult.PageResultBuilder.aPageResult()
|
||||
.list(pageInfo.getList())
|
||||
.totalPageNum((int) pageInfo.getTotal())
|
||||
.build();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -17,8 +17,8 @@ Shoulder 平台各个工程的`基础设施层`统一实现（为了简化使用
|
||||
|
||||
## 统一更换 shoulder-framework 版本
|
||||
```xml
|
||||
<shoulder.version>0.4</shoulder.version><!-- shoulder-version -->
|
||||
<version>0.4</version><!-- shoulder-version -->
|
||||
<shoulder.version>0.5-SNAPSHOT</shoulder.version><!-- shoulder-version -->
|
||||
<version>0.5-SNAPSHOT</version><!-- shoulder-version -->
|
||||
```
|
||||
|
||||
## 统一更换 shoulder-platform-common 版本
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
<shoulder.version>0.4</shoulder.version><!-- shoulder-version -->
|
||||
<shoulder.version>0.5-SNAPSHOT</shoulder.version><!-- shoulder-version -->
|
||||
<shoulder-platform.version>0.1-SNAPSHOT</shoulder-platform.version>
|
||||
</properties>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>cn.itlym</groupId>
|
||||
<artifactId>shoulder-parent</artifactId>
|
||||
<version>0.4</version><!-- shoulder-version -->
|
||||
<version>0.5-SNAPSHOT</version><!-- shoulder-version -->
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<properties>
|
||||
<!-- =============== Shoulder 版本 =============== -->
|
||||
|
||||
<shoulder.version>0.4</shoulder.version><!-- shoulder-version -->
|
||||
<shoulder.version>0.5-SNAPSHOT</shoulder.version><!-- shoulder-version -->
|
||||
<shoulder-platform.version>1.0-SNAPSHOT</shoulder-platform.version><!-- shoulder-platform-version -->
|
||||
|
||||
<shoulder-sms-aliyun.version>1.0-SNAPSHOT</shoulder-sms-aliyun.version><!-- shoulder-sms-aliyun.version -->
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>cn.itlym</groupId>
|
||||
<artifactId>shoulder-parent</artifactId>
|
||||
<version>0.4</version><!-- shoulder-version -->
|
||||
<version>0.5-SNAPSHOT</version><!-- shoulder-version -->
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user