diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml index 8341580..8d95cce 100644 --- a/blade-core-boot/pom.xml +++ b/blade-core-boot/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-boot/src/main/resources/bootstrap.yml b/blade-core-boot/src/main/resources/bootstrap.yml index 8860f1e..9087936 100644 --- a/blade-core-boot/src/main/resources/bootstrap.yml +++ b/blade-core-boot/src/main/resources/bootstrap.yml @@ -101,7 +101,7 @@ mybatis-plus: swagger: title: SpringBlade 接口文档系统 description: SpringBlade 接口文档系统 - version: 3.7.1 + version: 3.7.2 license: Powered By SpringBlade licenseUrl: https://bladex.vip terms-of-service-url: https://bladex.vip diff --git a/blade-core-cloud/pom.xml b/blade-core-cloud/pom.xml index 06c6c34..8cf1950 100644 --- a/blade-core-cloud/pom.xml +++ b/blade-core-cloud/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-crypto/pom.xml b/blade-core-crypto/pom.xml index 05e74a2..6f77caa 100644 --- a/blade-core-crypto/pom.xml +++ b/blade-core-crypto/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-datascope/pom.xml b/blade-core-datascope/pom.xml index 5fbbd4b..663df8f 100644 --- a/blade-core-datascope/pom.xml +++ b/blade-core-datascope/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml index af56b47..1940ae9 100644 --- a/blade-core-develop/pom.xml +++ b/blade-core-develop/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml index e8c81bd..e76c37f 100644 --- a/blade-core-launch/pom.xml +++ b/blade-core-launch/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java index 2b4eb55..141010b 100644 --- a/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java +++ b/blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java @@ -25,7 +25,7 @@ public interface AppConstant { /** * 应用版本 */ - String APPLICATION_VERSION = "3.7.1"; + String APPLICATION_VERSION = "3.7.2"; /** * 基础包 diff --git a/blade-core-loadbalancer/pom.xml b/blade-core-loadbalancer/pom.xml index 2c98fd5..e3f26ef 100644 --- a/blade-core-loadbalancer/pom.xml +++ b/blade-core-loadbalancer/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml index a75d5f7..25a4d9c 100644 --- a/blade-core-log/pom.xml +++ b/blade-core-log/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml index 98154db..f84025c 100644 --- a/blade-core-mybatis/pom.xml +++ b/blade-core-mybatis/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseServiceImpl.java b/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseServiceImpl.java index 2ce62ab..493c0d1 100644 --- a/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseServiceImpl.java +++ b/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseServiceImpl.java @@ -17,6 +17,7 @@ package org.springblade.core.mp.base; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.SneakyThrows; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.tool.constant.BladeConstant; @@ -24,6 +25,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotEmpty; +import java.util.Collection; import java.util.Date; import java.util.List; @@ -39,6 +41,35 @@ public class BaseServiceImpl, T extends BaseEntity> exte @Override public boolean save(T entity) { + this.resolveSave(entity); + return super.save(entity); + } + + @Override + public boolean saveBatch(Collection entityList, int batchSize) { + entityList.forEach(this::resolveSave); + return super.saveBatch(entityList, batchSize); + } + + @Override + public boolean updateById(T entity) { + this.resolveUpdate(entity); + return super.updateById(entity); + } + + @Override + public boolean updateBatchById(Collection entityList, int batchSize) { + entityList.forEach(this::resolveUpdate); + return super.updateBatchById(entityList, batchSize); + } + + @Override + public boolean deleteLogic(@NotEmpty List ids) { + return super.removeByIds(ids); + } + + @SneakyThrows + private void resolveSave(T entity) { BladeUser user = SecureUtil.getUser(); if (user != null) { entity.setCreateUser(user.getUserId()); @@ -51,22 +82,15 @@ public class BaseServiceImpl, T extends BaseEntity> exte entity.setStatus(BladeConstant.DB_STATUS_NORMAL); } entity.setIsDeleted(BladeConstant.DB_NOT_DELETED); - return super.save(entity); } - @Override - public boolean updateById(T entity) { + @SneakyThrows + private void resolveUpdate(T entity) { BladeUser user = SecureUtil.getUser(); if (user != null) { entity.setUpdateUser(user.getUserId()); } entity.setUpdateTime(DateUtil.now()); - return super.updateById(entity); - } - - @Override - public boolean deleteLogic(@NotEmpty List ids) { - return super.removeByIds(ids); } } diff --git a/blade-core-oss/pom.xml b/blade-core-oss/pom.xml index 2cfc55f..4279fa1 100644 --- a/blade-core-oss/pom.xml +++ b/blade-core-oss/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-report/pom.xml b/blade-core-report/pom.xml index fe12c5d..5063e4a 100644 --- a/blade-core-report/pom.xml +++ b/blade-core-report/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml index 85c8bc8..dc27f2f 100644 --- a/blade-core-secure/pom.xml +++ b/blade-core-secure/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-social/pom.xml b/blade-core-social/pom.xml index 1ac40a8..160d434 100644 --- a/blade-core-social/pom.xml +++ b/blade-core-social/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml index 91c1b24..dadfe41 100644 --- a/blade-core-swagger/pom.xml +++ b/blade-core-swagger/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java b/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java index 161ff66..c830264 100644 --- a/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java +++ b/blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java @@ -55,7 +55,7 @@ public class SwaggerProperties { /** * 版本 **/ - private String version = "3.7.1"; + private String version = "3.7.2"; /** * 许可证 **/ diff --git a/blade-core-test/pom.xml b/blade-core-test/pom.xml index d420c32..a05c988 100644 --- a/blade-core-test/pom.xml +++ b/blade-core-test/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml index 5de5ca6..c83be42 100644 --- a/blade-core-tool/pom.xml +++ b/blade-core-tool/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-tool - 3.7.1 + 3.7.2 4.0.0 diff --git a/blade-core-transaction/pom.xml b/blade-core-transaction/pom.xml index acc02ce..7ba079f 100644 --- a/blade-core-transaction/pom.xml +++ b/blade-core-transaction/pom.xml @@ -5,7 +5,7 @@ blade-tool org.springblade - 3.7.1 + 3.7.2 4.0.0 diff --git a/pom.xml b/pom.xml index fac3035..08e66de 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springblade blade-tool - 3.7.1 + 3.7.2 pom blade-tool @@ -36,7 +36,7 @@ - 3.7.1 + 3.7.2 1.8 3.8.1