chore: continew-starter 2.8.2 => 2.8.3

1.移除 BaseReq、BaseDO、BaseCreateDO、BaseUpdateDO 等(已移动到 Admin 项目内)
2.移除 BaseReq
3.修复查询条件校验无效的问题
4.调整版本为 3.5.0-SNAPSHOT,方便区分稳定版和快照版
This commit is contained in:
2025-01-16 21:53:08 +08:00
parent aab3931f30
commit cefbf82f20
26 changed files with 76 additions and 80 deletions

View File

@@ -1,10 +1,10 @@
# ContiNew Admin 中后台管理框架
<a href="https://github.com/continew-org/continew-admin" title="Release" target="_blank">
<img src="https://img.shields.io/badge/RELEASE-v3.4.1-%23ff3f59.svg" alt="Release" />
<img src="https://img.shields.io/badge/SNAPSHOT-v3.5.0-%23ff3f59.svg" alt="Release" />
</a>
<a href="https://github.com/continew-org/continew-starter" title="ContiNew Starter" target="_blank">
<img src="https://img.shields.io/badge/ContiNew Starter-2.8.2-%236CB52D.svg" alt="ContiNew Starter" />
<img src="https://img.shields.io/badge/ContiNew Starter-2.8.3-%236CB52D.svg" alt="ContiNew Starter" />
</a>
<a href="https://spring.io/projects/spring-boot" title="Spring Boot" target="_blank">
<img src="https://img.shields.io/badge/Spring Boot-3.2.12-%236CB52D.svg?logo=Spring-Boot" alt="Spring Boot" />
@@ -229,7 +229,7 @@ public class DeptController extends BaseController<DeptService, DeptResp, DeptDe
| <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design</a> | 2.56.0 | 字节跳动推出的前端 UI 框架,年轻化的色彩和组件设计。 |
| <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 5.0.4 | TypeScript 是微软开发的一个开源的编程语言,通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
| <a href="https://vite.dev/" target="_blank">Vite</a> | 5.1.5 | 下一代的前端工具链,为开发提供极速响应。 |
| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.8.2 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包(如 MyBatis-Plus、SaToken可轻松集成到应用中为开发人员减少手动引入依赖及配置的麻烦为 Spring Boot Web 项目的灵活快速构建提供支持。 |
| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.8.3 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包(如 MyBatis-Plus、SaToken可轻松集成到应用中为开发人员减少手动引入依赖及配置的麻烦为 Spring Boot Web 项目的灵活快速构建提供支持。 |
| <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a> | 3.2.12 | 简化 Spring 应用的初始搭建和开发过程基于“约定优于配置”的理念使开发人员不再需要定义样板化的配置。Spring Boot 3.0 开始,要求 Java 17 作为最低版本) |
| <a href="https://undertow.io/" target="_blank">Undertow</a> | 2.3.17.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 |
| <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a> | 1.39.0 | 轻量级 Java 权限认证框架,让鉴权变得简单、优雅。 |

View File

@@ -28,7 +28,6 @@ import top.continew.starter.extension.crud.annotation.CrudApi;
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
import top.continew.starter.extension.crud.controller.AbstractBaseController;
import top.continew.starter.extension.crud.enums.Api;
import top.continew.starter.extension.crud.model.req.BaseReq;
import top.continew.starter.extension.crud.service.BaseService;
import java.lang.reflect.Method;
@@ -45,7 +44,7 @@ import java.util.List;
* @author Charles7c
* @since 2024/12/6 20:30
*/
public class BaseController<S extends BaseService<L, D, Q, C>, L, D, Q, C extends BaseReq> extends AbstractBaseController<S, L, D, Q, C> {
public class BaseController<S extends BaseService<L, D, Q, C>, L, D, Q, C> extends AbstractBaseController<S, L, D, Q, C> {
@Override
public void preHandle(CrudApi crudApi, Object[] args, Method targetMethod, Class<?> targetClass) throws Exception {

View File

@@ -22,9 +22,9 @@ import jakarta.validation.constraints.NotEmpty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
@@ -36,7 +36,7 @@ import java.util.List;
*/
@Data
@Schema(description = "创建或修改客户端参数")
public class ClientReq extends BaseReq {
public class ClientReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -23,9 +23,9 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 创建或修改部门参数
@@ -35,7 +35,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "创建或修改部门参数")
public class DeptReq extends BaseReq {
public class DeptReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -23,9 +23,9 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 创建或修改字典项参数
@@ -35,7 +35,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "创建或修改字典项参数")
public class DictItemReq extends BaseReq {
public class DictItemReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -22,9 +22,9 @@ import jakarta.validation.constraints.Pattern;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.constant.RegexConstants;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 创建或修改字典参数
@@ -34,7 +34,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "创建或修改字典参数")
public class DictReq extends BaseReq {
public class DictReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -20,9 +20,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 修改文件参数
@@ -32,7 +32,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "修改文件参数")
public class FileReq extends BaseReq {
public class FileReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -24,9 +24,9 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.system.enums.MenuTypeEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 创建或修改菜单参数
@@ -36,7 +36,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "创建或修改菜单参数")
public class MenuReq extends BaseReq {
public class MenuReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -22,9 +22,9 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.system.enums.MessageTypeEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 创建消息参数
@@ -34,7 +34,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "创建消息参数")
public class MessageReq extends BaseReq {
public class MessageReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -23,9 +23,9 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.system.enums.NoticeScopeEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
@@ -37,7 +37,7 @@ import java.util.List;
*/
@Data
@Schema(description = "创建或修改公告参数")
public class NoticeReq extends BaseReq {
public class NoticeReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -21,9 +21,9 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 修改参数参数
@@ -33,7 +33,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "修改参数参数")
public class OptionReq extends BaseReq {
public class OptionReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -24,9 +24,9 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.constant.RegexConstants;
import top.continew.admin.common.enums.DataScopeEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -38,7 +38,7 @@ import java.util.List;
*/
@Data
@Schema(description = "创建或修改角色参数")
public class RoleReq extends BaseReq {
public class RoleReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -26,9 +26,9 @@ import top.continew.admin.common.constant.RegexConstants;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.system.enums.StorageTypeEnum;
import top.continew.admin.system.validation.ValidationGroup;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 存储请求参数
@@ -38,7 +38,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "存储请求参数")
public class StorageReq extends BaseReq {
public class StorageReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -22,9 +22,9 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.system.enums.ImportPolicyEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
/**
* 用户导入参数
@@ -34,7 +34,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "用户导入参数")
public class UserImportReq extends BaseReq {
public class UserImportReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -23,10 +23,10 @@ import jakarta.validation.constraints.Pattern;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.constant.RegexConstants;
import top.continew.starter.extension.crud.model.req.BaseReq;
import top.continew.starter.extension.crud.validation.CrudValidationGroup;
import java.io.Serial;
import java.io.Serializable;
/**
* 用户导入行数据
@@ -36,7 +36,7 @@ import java.io.Serial;
*/
@Data
@Schema(description = "用户导入行数据")
public class UserImportRowReq extends BaseReq {
public class UserImportRowReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -27,10 +27,10 @@ import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.constant.RegexConstants;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.enums.GenderEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import top.continew.starter.extension.crud.validation.CrudValidationGroup;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
@@ -41,7 +41,7 @@ import java.util.List;
*/
@Data
@Schema(description = "创建或修改用户参数")
public class UserReq extends BaseReq {
public class UserReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -1,13 +1,5 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasTimeField>
import java.time.*;
</#if>
<#if hasBigDecimalField>
import java.math.BigDecimal;
</#if>
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -17,6 +9,14 @@ import com.alibaba.excel.annotation.ExcelProperty;
import top.continew.admin.common.model.resp.BaseDetailResp;
import java.io.Serial;
<#if hasTimeField>
import java.time.*;
</#if>
<#if hasBigDecimalField>
import java.math.BigDecimal;
</#if>
/**
* ${businessName}详情信息
*

View File

@@ -1,5 +1,11 @@
package ${packageName}.${subPackageName};
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.continew.admin.common.model.entity.BaseDO;
import java.io.Serial;
<#if hasTimeField>
import java.time.*;
@@ -8,12 +14,6 @@ import java.time.*;
import java.math.BigDecimal;
</#if>
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import top.continew.admin.common.model.entity.BaseDO;
/**
* ${businessName}实体
*

View File

@@ -1,5 +1,12 @@
package ${packageName}.${subPackageName};
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.continew.starter.data.core.annotation.Query;
import top.continew.starter.data.core.enums.QueryType;
import java.io.Serial;
import java.io.Serializable;
<#if hasTimeField>
@@ -9,13 +16,6 @@ import java.time.*;
import java.math.BigDecimal;
</#if>
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.continew.starter.data.core.annotation.Query;
import top.continew.starter.data.core.enums.QueryType;
/**
* ${businessName}查询条件
*

View File

@@ -1,13 +1,5 @@
package ${packageName}.${subPackageName};
import java.io.Serial;
<#if hasTimeField>
import java.time.*;
</#if>
<#if hasBigDecimalField>
import java.math.BigDecimal;
</#if>
<#if hasRequiredField>
import jakarta.validation.constraints.*;
</#if>
@@ -18,7 +10,14 @@ import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
<#if hasTimeField>
import java.time.*;
</#if>
<#if hasBigDecimalField>
import java.math.BigDecimal;
</#if>
/**
* 创建或修改${businessName}参数
@@ -28,7 +27,7 @@ import top.continew.starter.extension.crud.model.req.BaseReq;
*/
@Data
@Schema(description = "创建或修改${businessName}参数")
public class ${className} extends BaseReq {
public class ${className} implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -1,5 +1,11 @@
package ${packageName}.${subPackageName};
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.continew.admin.common.model.resp.BaseResp;
import java.io.Serial;
<#if hasTimeField>
import java.time.*;
@@ -8,12 +14,6 @@ import java.time.*;
import java.math.BigDecimal;
</#if>
import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
import top.continew.admin.common.model.resp.BaseResp;
/**
* ${businessName}信息
*

View File

@@ -22,9 +22,9 @@ import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.starter.extension.crud.model.req.BaseReq;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -36,7 +36,7 @@ import java.time.LocalDateTime;
*/
@Data
@Schema(description = "创建或修改应用参数")
public class AppReq extends BaseReq {
public class AppReq implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

@@ -155,13 +155,11 @@ public class LogDaoLocalImpl implements LogDao {
return;
} else if (requestBody.contains(AuthTypeEnum.EMAIL.getValue())) {
EmailLoginReq authReq = JSONUtil.toBean(requestBody, EmailLoginReq.class);
logDO.setCreateUser(ExceptionUtils.exToNull(() -> userService.getByEmail(authReq.getEmail())
.getId()));
logDO.setCreateUser(ExceptionUtils.exToNull(() -> userService.getByEmail(authReq.getEmail()).getId()));
return;
} else if (requestBody.contains(AuthTypeEnum.PHONE.getValue())) {
PhoneLoginReq authReq = JSONUtil.toBean(requestBody, PhoneLoginReq.class);
logDO.setCreateUser(ExceptionUtils.exToNull(() -> userService.getByPhone(authReq.getPhone())
.getId()));
logDO.setCreateUser(ExceptionUtils.exToNull(() -> userService.getByPhone(authReq.getPhone()).getId()));
return;
}
}

View File

@@ -5,5 +5,5 @@
\____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_|
:: ${project.name} :: v${project.version}
:: ContiNew Starter :: v2.8.2
:: ContiNew Starter :: v2.8.3
:: Spring Boot :: v${spring-boot.version}

View File

@@ -5,7 +5,7 @@ project:
# 应用名称
app-name: continew-admin
# 版本
version: 3.4.1
version: 3.5.0-SNAPSHOT
# 描述
description: 持续迭代优化的前后端分离中后台管理系统框架,开箱即用,持续提供舒适的开发体验。
# 基本包

View File

@@ -13,7 +13,7 @@
<parent>
<groupId>top.continew</groupId>
<artifactId>continew-starter</artifactId>
<version>2.8.2</version>
<version>2.8.3</version>
</parent>
<groupId>top.continew</groupId>
@@ -33,7 +33,7 @@
<properties>
<!-- 项目版本号 -->
<revision>3.4.1</revision>
<revision>3.5.0-SNAPSHOT</revision>
</properties>
<!-- 全局依赖版本管理 -->