diff --git a/README.md b/README.md index 99eee836..4b3be98a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Release -ContiNew Starter +ContiNew Starter Spring Boot @@ -219,7 +219,7 @@ public class DeptController extends BaseControllerArco Design | 2.57.0 | 字节跳动推出的前端 UI 框架,年轻化的色彩和组件设计。 | | TypeScript | 5.0.4 | TypeScript 是微软开发的一个开源的编程语言,通过在 JavaScript 的基础上添加静态类型定义构建而成。 | | Vite | 5.1.5 | 下一代的前端工具链,为开发提供极速响应。 | -| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.11.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包(如 MyBatis-Plus、SaToken),可轻松集成到应用中,为开发人员减少手动引入依赖及配置的麻烦,为 Spring Boot Web 项目的灵活快速构建提供支持。 | +| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.12.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包(如 MyBatis-Plus、SaToken),可轻松集成到应用中,为开发人员减少手动引入依赖及配置的麻烦,为 Spring Boot Web 项目的灵活快速构建提供支持。 | | Spring Boot | 3.3.9 | 简化 Spring 应用的初始搭建和开发过程,基于“约定优于配置”的理念,使开发人员不再需要定义样板化的配置。(Spring Boot 3.0 开始,要求 Java 17 作为最低版本) | | Undertow | 2.3.18.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 | | Sa-Token + JWT | 1.41.0 | 轻量级 Java 权限认证框架,让鉴权变得简单、优雅。 | diff --git a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java index f3138bfd..528e0694 100644 --- a/continew-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java +++ b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java @@ -18,8 +18,7 @@ package top.continew.admin.common.config.mybatis; import org.springframework.security.crypto.password.PasswordEncoder; import top.continew.starter.security.crypto.encryptor.IEncryptor; - -import java.util.regex.Pattern; +import top.continew.starter.security.password.constant.PasswordEncoderConstants; /** * BCrypt 加/解密处理器(不可逆) @@ -29,10 +28,6 @@ import java.util.regex.Pattern; */ public class BCryptEncryptor implements IEncryptor { - /** - * BCrypt 正则表达式 - */ - private static final Pattern BCRYPT_PATTERN = Pattern.compile("\\A\\$2(a|y|b)?\\$(\\d\\d)\\$[./0-9A-Za-z]{53}"); private final PasswordEncoder passwordEncoder; public BCryptEncryptor(PasswordEncoder passwordEncoder) { @@ -42,7 +37,7 @@ public class BCryptEncryptor implements IEncryptor { @Override public String encrypt(String plaintext, String password, String publicKey) { // 如果已经是 BCrypt 加密格式,直接返回 - if (BCRYPT_PATTERN.matcher(plaintext).matches()) { + if (PasswordEncoderConstants.BCRYPT_PATTERN.matcher(plaintext).matches()) { return plaintext; } return passwordEncoder.encode(plaintext); diff --git a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java index 6a9adce1..b9fa1fbd 100644 --- a/continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java @@ -188,8 +188,8 @@ public class StorageServiceImpl extends BaseServiceImpl { FileStorageProperties.AmazonS3Config config = new FileStorageProperties.AmazonS3Config(); diff --git a/continew-webapi/src/main/resources/banner.txt b/continew-webapi/src/main/resources/banner.txt index 2f688249..e7674c03 100644 --- a/continew-webapi/src/main/resources/banner.txt +++ b/continew-webapi/src/main/resources/banner.txt @@ -5,5 +5,5 @@ \____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_| :: ${project.name} :: v${project.version} - :: ContiNew Starter :: v2.11.0 + :: ContiNew Starter :: v2.12.0 :: Spring Boot :: v${spring-boot.version} diff --git a/pom.xml b/pom.xml index ea5630aa..4983c3f1 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ top.continew continew-starter - 2.11.0 + 2.12.0 top.continew