Skip to content

Commit 59daee7

Browse files
committed
build: continew-starter 2.11.0 => 2.12.0
1.使用 PasswordEncoderConstants 常量 2.兼容redis没配置密码时出现redisson实例化失败的问题 3.修复导出时无法正确捕捉异常的问题 4.修复默认 Response 类 msg 传递污染的问题 5.修复 /file/ 注册资源映射时被解析为 /file//** 的问题
1 parent 0726a21 commit 59daee7

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

README.md

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

continew-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818

1919
import org.springframework.security.crypto.password.PasswordEncoder;
2020
import top.continew.starter.security.crypto.encryptor.IEncryptor;
21-
22-
import java.util.regex.Pattern;
21+
import top.continew.starter.security.password.constant.PasswordEncoderConstants;
2322

2423
/**
2524
* BCrypt 加/解密处理器(不可逆)
@@ -29,10 +28,6 @@
2928
*/
3029
public class BCryptEncryptor implements IEncryptor {
3130

32-
/**
33-
* BCrypt 正则表达式
34-
*/
35-
private static final Pattern BCRYPT_PATTERN = Pattern.compile("\\A\\$2(a|y|b)?\\$(\\d\\d)\\$[./0-9A-Za-z]{53}");
3631
private final PasswordEncoder passwordEncoder;
3732

3833
public BCryptEncryptor(PasswordEncoder passwordEncoder) {
@@ -42,7 +37,7 @@ public BCryptEncryptor(PasswordEncoder passwordEncoder) {
4237
@Override
4338
public String encrypt(String plaintext, String password, String publicKey) {
4439
// 如果已经是 BCrypt 加密格式,直接返回
45-
if (BCRYPT_PATTERN.matcher(plaintext).matches()) {
40+
if (PasswordEncoderConstants.BCRYPT_PATTERN.matcher(plaintext).matches()) {
4641
return plaintext;
4742
}
4843
return passwordEncoder.encode(plaintext);

continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ public void load(StorageDO storage) {
188188
fileStorageList.addAll(FileStorageServiceBuilder.buildLocalPlusFileStorage(Collections
189189
.singletonList(config)));
190190
// 注册资源映射
191-
SpringWebUtils.registerResourceHandler(MapUtil.of(URLUtil.url(StrUtil.removeSuffix(storage
192-
.getDomain(), StringConstants.SLASH)).getPath(), storage.getBucketName()));
191+
SpringWebUtils.registerResourceHandler(MapUtil.of(URLUtil.url(storage.getDomain()).getPath(), storage
192+
.getBucketName()));
193193
}
194194
case OSS -> {
195195
FileStorageProperties.AmazonS3Config config = new FileStorageProperties.AmazonS3Config();

continew-webapi/src/main/resources/banner.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
\____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_|
66

77
:: ${project.name} :: v${project.version}
8-
:: ContiNew Starter :: v2.11.0
8+
:: ContiNew Starter :: v2.12.0
99
:: Spring Boot :: v${spring-boot.version}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>top.continew</groupId>
1515
<artifactId>continew-starter</artifactId>
16-
<version>2.11.0</version>
16+
<version>2.12.0</version>
1717
</parent>
1818

1919
<groupId>top.continew</groupId>

0 commit comments

Comments
 (0)