From 0f1479f40deef83a5f5d64cbc24a7691b274b112 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 15 Aug 2024 00:07:59 +0800 Subject: [PATCH] chore: continew-starter 2.5.1 => 2.5.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 接口文档显示优化 增强 SQL 注入防御 --- README.md | 4 ++-- .../system/service/impl/LogServiceImpl.java | 17 +++++++++-------- .../system/service/impl/MessageServiceImpl.java | 8 +++++--- .../system/service/impl/OptionServiceImpl.java | 2 +- .../system/service/impl/UserServiceImpl.java | 5 ++++- .../src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index f4f56fec..939d2e22 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Sonar Status -ContiNew Starter +ContiNew Starter Spring Boot @@ -216,7 +216,7 @@ public class DeptController extends BaseControllerArco Design | 2.55.0 | 字节跳动推出的前端 UI 框架，年轻化的色彩和组件设计。 | | TypeScript | 5.0.4 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 | | Vite | 5.1.5 | 下一代的前端工具链，为开发提供极速响应。 | -| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.5.1 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | +| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.5.2 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | | Spring Boot | 3.2.7 | 简化 Spring 应用的初始搭建和开发过程，基于“约定优于配置”的理念，使开发人员不再需要定义样板化的配置。（Spring Boot 3.0 开始，要求 Java 17 作为最低版本） | | Undertow | 2.3.13.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 | | Sa-Token + JWT | 1.38.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 | diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java index 1c646442..ec4aacb0 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java @@ -19,11 +19,11 @@ package top.continew.admin.system.service.impl; import cn.crane4j.annotation.AutoOperate; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Opt; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -67,7 +67,8 @@ public class LogServiceImpl implements LogService { @Override public PageResp page(LogQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = this.buildQueryWrapper(query); - IPage page = baseMapper.selectLogPage(pageQuery.toPage(), queryWrapper); + IPage page = baseMapper.selectLogPage(new Page<>(pageQuery.getPage(), pageQuery + .getSize()), queryWrapper); return PageResp.build(page); } @@ -132,12 +133,12 @@ public class LogServiceImpl implements LogService { * @param sortQuery 排序查询条件 */ private void sort(QueryWrapper queryWrapper, SortQuery sortQuery) { - Sort sort = Opt.ofNullable(sortQuery).orElseGet(SortQuery::new).getSort(); - for (Sort.Order order : sort) { - if (null != order) { - String property = order.getProperty(); - queryWrapper.orderBy(true, order.isAscending(), CharSequenceUtil.toUnderlineCase(property)); - } + if (sortQuery == null || sortQuery.getSort().isUnsorted()) { + return; + } + for (Sort.Order order : sortQuery.getSort()) { + String property = order.getProperty(); + queryWrapper.orderBy(true, order.isAscending(), CharSequenceUtil.toUnderlineCase(property)); } } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java index aa067294..3776331f 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java @@ -21,6 +21,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +33,7 @@ import top.continew.admin.system.model.resp.MessageResp; import top.continew.admin.system.service.MessageService; import top.continew.admin.system.service.MessageUserService; import top.continew.starter.core.util.validate.CheckUtils; -import top.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; +import top.continew.starter.data.mybatis.plus.util.QueryWrapperHelper; import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.resp.PageResp; @@ -54,10 +55,11 @@ public class MessageServiceImpl implements MessageService { @Override @AutoOperate(type = MessageResp.class, on = "list") public PageResp page(MessageQuery query, PageQuery pageQuery) { - QueryWrapper queryWrapper = QueryWrapperHelper.build(query); + QueryWrapper queryWrapper = QueryWrapperHelper.build(query, pageQuery.getSort()); queryWrapper.apply(null != query.getUserId(), "t2.user_id={0}", query.getUserId()) .apply(null != query.getIsRead(), "t2.is_read={0}", query.getIsRead()); - IPage page = baseMapper.selectPageByUserId(pageQuery.toPage(), queryWrapper); + IPage page = baseMapper.selectPageByUserId(new Page<>(pageQuery.getPage(), pageQuery + .getSize()), queryWrapper); return PageResp.build(page); } diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java index d719cf50..e7542ad5 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java @@ -38,7 +38,7 @@ import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.core.util.validate.ValidationUtils; -import top.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; +import top.continew.starter.data.mybatis.plus.util.QueryWrapperHelper; import java.util.List; import java.util.Map; diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 63dad64b..8957c34b 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -40,6 +40,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -116,7 +117,9 @@ public class UserServiceImpl extends BaseServiceImpl page(UserQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = this.buildQueryWrapper(query); - IPage page = baseMapper.selectUserPage(pageQuery.toPage(), queryWrapper); + super.sort(queryWrapper, pageQuery); + IPage page = baseMapper.selectUserPage(new Page<>(pageQuery.getPage(), pageQuery + .getSize()), queryWrapper); PageResp pageResp = PageResp.build(page, super.getListClass()); pageResp.getList().forEach(this::fill); return pageResp; diff --git a/continew-admin-webapi/src/main/resources/banner.txt b/continew-admin-webapi/src/main/resources/banner.txt index d13009d2..e9f39d73 100644 --- a/continew-admin-webapi/src/main/resources/banner.txt +++ b/continew-admin-webapi/src/main/resources/banner.txt @@ -5,5 +5,5 @@ \____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_| :: ${project.name} :: v${project.version} - :: ContiNew Starter :: v2.5.1 + :: ContiNew Starter :: v2.5.2 :: Spring Boot :: v${spring-boot.version} diff --git a/pom.xml b/pom.xml index 0440b4dd..9f529ddc 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ top.continew continew-starter - 2.5.1 + 2.5.2 top.continew