From a110bd978929f00f48b8a8a604b890e4adf879e7 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 16 Jul 2024 22:37:46 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SpringBoot 3.1.11 => 3.2.7 SnailJob 1.1.0-beta1 => 1.1.0 MyBatisPlus 3.5.5 => 3.5.7 MyBatisFlex 1.8.9 => 1.9.3 dynamic-datasource 4.3.0 => 4.3.1 JetCache 2.7.5 => 2.7.6 Redisson 3.30.0 => 3.32.0 CosID 2.6.8 => 2.9.1 EasyExcel 3.3.4 => 4.0.1 XFileStorage 2.1.0 => 2.2.0 Crane4j 2.8.0 => 2.9.0 Hutool 5.8.27 => 5.8.29 AWS S3 1.12.720 => 1.12.761 IP2Region 3.1.11 => 3.2.6 --- .../ThreadPoolAutoConfiguration.java | 8 ++--- .../DataPermissionHandlerImpl.java | 16 +++++----- .../plus/service/impl/ServiceImpl.java | 4 +-- continew-starter-dependencies/pom.xml | 30 +++++++++---------- .../crud/service/impl/BaseServiceImpl.java | 8 ++--- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java index 24e6e837..3bfa60b9 100644 --- a/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java @@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.task.TaskExecutorCustomizer; -import org.springframework.boot.task.TaskSchedulerCustomizer; +import org.springframework.boot.task.ThreadPoolTaskExecutorCustomizer; +import org.springframework.boot.task.ThreadPoolTaskSchedulerCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.EnableScheduling; @@ -53,7 +53,7 @@ public class ThreadPoolAutoConfiguration { */ @Bean @ConditionalOnProperty(prefix = "spring.task.execution.extension", name = PropertiesConstants.ENABLED, matchIfMissing = true) - public TaskExecutorCustomizer taskExecutorCustomizer(ThreadPoolExtensionProperties properties) { + public ThreadPoolTaskExecutorCustomizer threadPoolTaskExecutorCustomizer(ThreadPoolExtensionProperties properties) { return executor -> { // 核心（最小）线程数 executor.setCorePoolSize(corePoolSize); @@ -74,7 +74,7 @@ public class ThreadPoolAutoConfiguration { @ConditionalOnProperty(prefix = "spring.task.scheduling.extension", name = PropertiesConstants.ENABLED, matchIfMissing = true) public static class TaskSchedulerConfiguration { @Bean - public TaskSchedulerCustomizer taskSchedulerCustomizer(ThreadPoolExtensionProperties properties) { + public ThreadPoolTaskSchedulerCustomizer threadPoolTaskSchedulerCustomizer(ThreadPoolExtensionProperties properties) { return executor -> { executor.setRejectedExecutionHandler(properties.getScheduling() .getRejectedPolicy() diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java index a569c0a7..b842512b 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java @@ -30,9 +30,7 @@ import net.sf.jsqlparser.expression.operators.relational.ExpressionList; import net.sf.jsqlparser.expression.operators.relational.InExpression; import net.sf.jsqlparser.schema.Column; import net.sf.jsqlparser.schema.Table; -import net.sf.jsqlparser.statement.select.PlainSelect; -import net.sf.jsqlparser.statement.select.SelectExpressionItem; -import net.sf.jsqlparser.statement.select.SubSelect; +import net.sf.jsqlparser.statement.select.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import top.continew.starter.core.constant.StringConstants; @@ -124,9 +122,9 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler { private Expression buildDeptAndChildExpression(DataPermission dataPermission, DataPermissionCurrentUser currentUser, Expression expression) { - SubSelect subSelect = new SubSelect(); + ParenthesedSelect subSelect = new ParenthesedSelect(); PlainSelect select = new PlainSelect(); - select.setSelectItems(Collections.singletonList(new SelectExpressionItem(new Column(dataPermission.id())))); + select.setSelectItems(Collections.singletonList(new SelectItem<>(new Column(dataPermission.id())))); select.setFromItem(new Table(dataPermission.deptTableAlias())); EqualsTo equalsTo = new EqualsTo(); equalsTo.setLeftExpression(new Column(dataPermission.id())); @@ -135,7 +133,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler { function.setName("find_in_set"); function.setParameters(new ExpressionList(new LongValue(currentUser.getDeptId()), new Column("ancestors"))); select.setWhere(new OrExpression(equalsTo, function)); - subSelect.setSelectBody(select); + subSelect.setSelect(select); // 构建父查询 InExpression inExpression = new InExpression(); inExpression.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.deptId())); @@ -201,15 +199,15 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler { private Expression buildCustomExpression(DataPermission dataPermission, DataPermissionCurrentUser.CurrentUserRole role, Expression expression) { - SubSelect subSelect = new SubSelect(); + ParenthesedSelect subSelect = new ParenthesedSelect(); PlainSelect select = new PlainSelect(); - select.setSelectItems(Collections.singletonList(new SelectExpressionItem(new Column(dataPermission.deptId())))); + select.setSelectItems(Collections.singletonList(new SelectItem<>(new Column(dataPermission.deptId())))); select.setFromItem(new Table(dataPermission.roleDeptTableAlias())); EqualsTo equalsTo = new EqualsTo(); equalsTo.setLeftExpression(new Column(dataPermission.roleId())); equalsTo.setRightExpression(new LongValue(role.getRoleId())); select.setWhere(equalsTo); - subSelect.setSelectBody(select); + subSelect.setSelect(select); // 构建父查询 InExpression inExpression = new InExpression(); inExpression.setLeftExpression(this.buildColumn(dataPermission.tableAlias(), dataPermission.deptId())); diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java index 0399d18f..54e9ce98 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java @@ -36,7 +36,7 @@ import java.util.List; */ public class ServiceImpl, T> extends com.baomidou.mybatisplus.extension.service.impl.ServiceImpl implements IService { - protected final List entityFields = ReflectUtils.getNonStaticFields(this.entityClass); + protected final List entityFields = ReflectUtils.getNonStaticFields(this.getEntityClass()); @Override public T getById(Serializable id) { @@ -53,7 +53,7 @@ public class ServiceImpl, T> extends com.baomidou.mybati protected T getById(Serializable id, boolean isCheckExists) { T entity = baseMapper.selectById(id); if (isCheckExists) { - CheckUtils.throwIfNotExists(entity, ClassUtil.getClassName(entityClass, true), "ID", id); + CheckUtils.throwIfNotExists(entity, ClassUtil.getClassName(this.getEntityClass(), true), "ID", id); } return entity; } diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml index 422d6299..507b4312 100644 --- a/continew-starter-dependencies/pom.xml +++ b/continew-starter-dependencies/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-dependencies - 3.1.11 + 3.2.7 @@ -44,35 +44,35 @@ 2.2.0 - 1.1.0-beta1 + 1.1.0 1.38.0 1.16.6 - 3.5.5 - 1.8.9 - 4.3.0 + 3.5.7 + 1.9.3 + 4.3.1 3.9.1 - 2.7.5 - 3.30.0 - 2.6.8 + 2.7.6 + 3.32.0 + 2.9.1 3.2.1 1.3.0 1.6.2 - 3.3.4 + 4.0.1 15.4 - 2.1.0 - 1.12.720 - 2.8.0 + 2.2.0 + 1.12.761 + 2.9.0 4.5.0 1.5.2 2.2 4.12.0 2.14.5 - 3.1.11 - 5.8.27 + 3.2.6 + 5.8.29 1.6.0 2.43.0 - 3.9.1.2184 + 3.11.0.3922 diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java index e61fbd2b..8356de25 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java @@ -132,7 +132,7 @@ public abstract class BaseServiceImpl, T extends BaseIdD public List listDict(Q query, SortQuery sortQuery) { QueryWrapper queryWrapper = this.buildQueryWrapper(query); this.sort(queryWrapper, sortQuery); - DictField dictField = entityClass.getDeclaredAnnotation(DictField.class); + DictField dictField = super.getEntityClass().getDeclaredAnnotation(DictField.class); CheckUtils.throwIfNull(dictField, "请添加并配置 @DictField 字典结构信息"); // 指定查询字典字段 queryWrapper.select(dictField.labelKey(), dictField.valueKey()); @@ -149,7 +149,7 @@ public abstract class BaseServiceImpl, T extends BaseIdD @Transactional(rollbackFor = Exception.class) public Long add(C req) { this.beforeAdd(req); - T entity = BeanUtil.copyProperties(req, entityClass); + T entity = BeanUtil.copyProperties(req, super.getEntityClass()); baseMapper.insert(entity); this.afterAdd(req, entity); return entity.getId(); @@ -169,7 +169,7 @@ public abstract class BaseServiceImpl, T extends BaseIdD @Transactional(rollbackFor = Exception.class) public void delete(List ids) { this.beforeDelete(ids); - baseMapper.deleteBatchIds(ids); + baseMapper.deleteByIds(ids); this.afterDelete(ids); } @@ -193,7 +193,7 @@ public abstract class BaseServiceImpl, T extends BaseIdD // 设置排序 this.sort(queryWrapper, sortQuery); List entityList = baseMapper.selectList(queryWrapper); - if (entityClass == targetClass) { + if (super.getEntityClass() == targetClass) { return (List)entityList; } return BeanUtil.copyToList(entityList, targetClass);