From 8e8520060d58dc0d1045ee30cce9301261e6251a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 20 Jul 2021 11:03:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=20v2.5.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docker/docker-compose.yml | 6 +++--- pom.xml | 4 ++-- ruoyi-extend/pom.xml | 2 +- ruoyi-extend/ruoyi-monitor-admin/pom.xml | 2 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 12 +++++++++++ ruoyi-ui/src/views/tool/gen/editTable.vue | 4 ++-- ruoyi-ui/vue.config.js | 2 +- ruoyi/pom.xml | 2 +- .../core/mybatisplus/core/BaseMapperPlus.java | 4 ++++ .../mybatisplus/core/ServicePlusImpl.java | 14 ++++++------- .../core/mybatisplus/methods/InsertAll.java | 2 +- .../demo/controller/TestBatchController.java | 2 +- .../framework/config/ThreadPoolConfig.java | 2 +- .../service/GenTableServiceImpl.java | 15 +++----------- .../main/resources/vm/java/controller.java.vm | 1 + .../src/main/resources/vm/java/domain.java.vm | 4 +++- .../src/main/resources/vm/java/editBo.java.vm | 4 +++- .../main/resources/vm/java/queryBo.java.vm | 20 ++++++++++++++----- ruoyi/src/main/resources/vm/java/vo.java.vm | 8 ++++++-- .../main/resources/vm/vue/index-tree.vue.vm | 2 +- ruoyi/src/main/resources/vm/vue/index.vue.vm | 2 +- 23 files changed, 71 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 6fb00c16f..1483d2f8e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE) [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.1-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.5.2-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.4-blue.svg)]() [![JDK-8+](https://img.shields.io/badge/JDK-8+-green.svg)]() [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]() diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 63c46a468..3413cf61c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -76,7 +76,7 @@ services: ipv4_address: 172.30.0.48 ruoyi-server1: - image: "ruoyi/ruoyi-server:2.5.1" + image: "ruoyi/ruoyi-server:2.5.2" environment: - TZ=Asia/Shanghai volumes: @@ -90,7 +90,7 @@ services: ipv4_address: 172.30.0.60 ruoyi-server2: - image: "ruoyi/ruoyi-server:2.5.1" + image: "ruoyi/ruoyi-server:2.5.2" environment: - TZ=Asia/Shanghai volumes: @@ -104,7 +104,7 @@ services: ipv4_address: 172.30.0.61 ruoyi-monitor-admin: - image: "ruoyi/ruoyi-monitor-admin:2.5.1" + image: "ruoyi/ruoyi-monitor-admin:2.5.2" environment: - TZ=Asia/Shanghai privileged: true diff --git a/pom.xml b/pom.xml index efca4b0f8..6344cc7df 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi-vue-plus - 2.5.1 + 2.5.2 RuoYi-Vue-Plus https://gitee.com/JavaLionLi/RuoYi-Vue-Plus RuoYi-Vue-Plus后台管理系统 - 2.5.1 + 2.5.2 2.4.8 UTF-8 UTF-8 diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index dc04bc641..46a8cfc7a 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 ruoyi-extend diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index 7c45549e1..b09375a03 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi-extend com.ruoyi - 2.5.1 + 2.5.2 4.0.0 jar diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index bdd09f43d..c9ca44bff 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-plus", - "version": "2.5.1", + "version": "2.5.2", "description": "RuoYi-Vue-Plus后台管理系统", "author": "LionLi", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 9f8e79fbd..78248557c 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -91,6 +91,18 @@ 更新日志 + +
    +
  1. update 优化代码生成器注释格式
    2. +
  2. fix 回滚代码生成 批处理优化
    3. +
  3. fix 代码生成 queryType 重复勾选数据库无默认值问题
    4. +
  4. fix 修复接口单参数校验无效问题
    5. +
  5. fix 代码生成 queryType >= <= 标识符错误问题
    6. +
  6. fix 修复代码生成字典问题
    7. +
  7. fix 修复 thread-pool: enabled 配置不生效问题
    8. +
  8. remove 删除无用文档与脚本
    9. +
+
  1. update 验证码开关 转移到表 参数管理 内
    2. diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue index 94d0ef33c..fc66dc5bf 100644 --- a/ruoyi-ui/src/views/tool/gen/editTable.vue +++ b/ruoyi-ui/src/views/tool/gen/editTable.vue @@ -68,9 +68,9 @@ - + - + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index c749c8c11..ee6353c2d 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -109,7 +109,7 @@ module.exports = { config.optimization.runtimeChunk('single'), { from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 - to: './', //到根目录下 + to: './' //到根目录下 } } ) diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml index 4943cd688..e1eb507d0 100644 --- a/ruoyi/pom.xml +++ b/ruoyi/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 2.5.1 + 2.5.2 4.0.0 jar diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java b/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java index cf51c90eb..ee779a5b8 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java @@ -13,6 +13,10 @@ import java.util.Collection; */ public interface BaseMapperPlus extends BaseMapper { + /** + * 单sql批量插入( 全量填充 无视数据库默认值 ) + * 适用于无脑插入 + */ int insertAll(@Param("list") Collection batchList); } diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java index 77b9c2860..fb0998b7f 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java @@ -51,11 +51,8 @@ public class ServicePlusImpl, T> extends ServiceImpl } /** - * 单条执行性能差 - * - * {@link #saveAll(Collection)} + * 单条执行性能差 适用于列表对象内容不确定 */ - @Deprecated @Override public boolean saveBatch(Collection entityList, int batchSize) { return super.saveBatch(entityList, batchSize); @@ -67,11 +64,8 @@ public class ServicePlusImpl, T> extends ServiceImpl } /** - * 单条执行性能差 - * - * {@link #saveAll(Collection)} + * 单条执行性能差 适用于列表对象内容不确定 */ - @Deprecated @Override public boolean saveOrUpdateBatch(Collection entityList, int batchSize) { return super.saveOrUpdateBatch(entityList, batchSize); @@ -82,6 +76,10 @@ public class ServicePlusImpl, T> extends ServiceImpl return super.updateBatchById(entityList, batchSize); } + /** + * 单sql批量插入( 全量填充 无视数据库默认值 ) + * 适用于无脑插入 + */ @Override public boolean saveAll(Collection entityList) { return baseMapper.insertAll(entityList) == entityList.size(); diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java b/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java index ec57621b8..66cf34c9b 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java @@ -13,7 +13,7 @@ import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; /** - * 单sql批量插入 + * 单sql批量插入( 全量填充 无视数据库默认值 ) * * @author Lion Li */ diff --git a/ruoyi/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi/src/main/java/com/ruoyi/demo/controller/TestBatchController.java index 499a5ad0d..334f004cd 100644 --- a/ruoyi/src/main/java/com/ruoyi/demo/controller/TestBatchController.java +++ b/ruoyi/src/main/java/com/ruoyi/demo/controller/TestBatchController.java @@ -29,7 +29,7 @@ public class TestBatchController extends BaseController { private final ITestDemoService iTestDemoService; /** - * 新增批量方法 + * 新增批量方法 ( 全量覆盖填充 ) */ @PostMapping() public AjaxResult add() { diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java index 104838327..7758e974a 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java @@ -26,7 +26,7 @@ public class ThreadPoolConfig { private ThreadPoolProperties threadPoolProperties; @Bean(name = "threadPoolTaskExecutor") - @ConditionalOnProperty(prefix = "threadPoolTaskExecutor", name = "enabled", havingValue = "true") + @ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true") public ThreadPoolTaskExecutor threadPoolTaskExecutor() { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); executor.setMaxPoolSize(threadPoolProperties.getMaxPoolSize()); diff --git a/ruoyi/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index 177891041..9eceadf08 100644 --- a/ruoyi/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -142,8 +142,7 @@ public class GenTableServiceImpl extends ServicePlusImpl 0) { // 保存列信息 List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - List saveColumns = new ArrayList<>(); for (GenTableColumn column : genTableColumns) { GenUtils.initColumnField(column, table); - saveColumns.add(column); + genTableColumnMapper.insert(column); } - if (CollUtil.isNotEmpty(saveColumns)) { - genTableColumnMapper.insertAll(saveColumns); - } } } } catch (Exception e) { @@ -291,16 +286,12 @@ public class GenTableServiceImpl extends ServicePlusImpl dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); - List saveColumns = new ArrayList<>(); dbTableColumns.forEach(column -> { if (!tableColumnNames.contains(column.getColumnName())) { GenUtils.initColumnField(column, table); - saveColumns.add(column); + genTableColumnMapper.insert(column); } }); - if (CollUtil.isNotEmpty(saveColumns)) { - genTableColumnMapper.insertAll(saveColumns); - } List delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(delColumns)) { diff --git a/ruoyi/src/main/resources/vm/java/controller.java.vm b/ruoyi/src/main/resources/vm/java/controller.java.vm index 900f51017..a87c6cdd9 100644 --- a/ruoyi/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi/src/main/resources/vm/java/controller.java.vm @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation; * @author ${author} * @date ${datetime} */ +@Validated @Api(value = "${functionName}控制器", tags = {"${functionName}管理"}) @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm index 5832be6c4..29a4f23c7 100644 --- a/ruoyi/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi/src/main/resources/vm/java/domain.java.vm @@ -24,7 +24,9 @@ public class ${ClassName} implements Serializable { #foreach ($column in $columns) - /** $column.columnComment */ + /** + * $column.columnComment + */ #if($column.javaField=="createBy"||$column.javaField=="createTime") @TableField(fill = FieldFill.INSERT) #end diff --git a/ruoyi/src/main/resources/vm/java/editBo.java.vm b/ruoyi/src/main/resources/vm/java/editBo.java.vm index 3533a91e2..6472fce62 100644 --- a/ruoyi/src/main/resources/vm/java/editBo.java.vm +++ b/ruoyi/src/main/resources/vm/java/editBo.java.vm @@ -23,7 +23,9 @@ public class ${ClassName}EditBo { #foreach ($column in $columns) #if($column.isEdit || $column.isPk==1) - /** $column.columnComment */ + /** + * $column.columnComment + */ @ApiModelProperty("$column.columnComment") #if($column.isRequired==1) #if($column.javaType == 'String') diff --git a/ruoyi/src/main/resources/vm/java/queryBo.java.vm b/ruoyi/src/main/resources/vm/java/queryBo.java.vm index 4c2b7eebe..537ff73a9 100644 --- a/ruoyi/src/main/resources/vm/java/queryBo.java.vm +++ b/ruoyi/src/main/resources/vm/java/queryBo.java.vm @@ -33,23 +33,33 @@ import com.ruoyi.common.core.domain.TreeEntity; @ApiModel("${functionName}分页查询对象") public class ${ClassName}QueryBo extends ${Entity} { - /** 分页大小 */ + /** + * 分页大小 + */ @ApiModelProperty("分页大小") private Integer pageSize; - /** 当前页数 */ + /** + * 当前页数 + */ @ApiModelProperty("当前页数") private Integer pageNum; - /** 排序列 */ + /** + * 排序列 + */ @ApiModelProperty("排序列") private String orderByColumn; - /** 排序的方向desc或者asc */ + /** + * 排序的方向desc或者asc + */ @ApiModelProperty(value = "排序的方向", example = "asc,desc") private String isAsc; #foreach ($column in $columns) #if(!$table.isSuperColumn($column.javaField) && $column.query) - /** $column.columnComment */ + /** + * $column.columnComment + */ @ApiModelProperty("$column.columnComment") private $column.javaType $column.javaField; #end diff --git a/ruoyi/src/main/resources/vm/java/vo.java.vm b/ruoyi/src/main/resources/vm/java/vo.java.vm index b07a7b4c7..8e941a999 100644 --- a/ruoyi/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi/src/main/resources/vm/java/vo.java.vm @@ -23,13 +23,17 @@ public class ${ClassName}Vo { private static final long serialVersionUID = 1L; - /** $pkColumn.columnComment */ + /** + * $pkColumn.columnComment + */ @ApiModelProperty("$pkColumn.columnComment") private ${pkColumn.javaType} ${pkColumn.javaField}; #foreach ($column in $columns) #if($column.isList && $column.isPk!=1) - /** $column.columnComment */ + /** + * $column.columnComment + */ #set($parentheseIndex=$column.columnComment.indexOf("（")) #if($parentheseIndex != -1) #set($comment=$column.columnComment.substring(0, $parentheseIndex)) diff --git a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm index 30489e07c..1ad93af6c 100644 --- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm @@ -105,7 +105,7 @@ {{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }} -#elseif($column.list && "" != $column.dictType) +#elseif($column.list && $column.dictType && "" != $column.dictType) #elseif($column.list && "" != $javaField) #if(${foreach.index} == 1) diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm index 6667c1e0c..1fc2bcc1f 100644 --- a/ruoyi/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm @@ -134,7 +134,7 @@ {{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }} -#elseif($column.list && "" != $column.dictType) +#elseif($column.list && $column.dictType && "" != $column.dictType) #elseif($column.list && "" != $javaField)