diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 24313407..c16beb3f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -6,7 +6,7 @@ body:
- type: markdown
attributes:
value: |
- 感谢您使用 ContiNew Admin！请您花些时间填写这份 Bug 报告。
+ 感谢您使用 ContiNew Admin！请您花些时间填写这份 Bug 报告。**温馨提示：我们利用业余时间维护开源项目，没有额外精力及人员维护已发布版本，所以请务必检查最新版本是否正常，如已修复请自行跟进修复！**
- type: checkboxes
id: checkboxes
attributes:
diff --git a/README.md b/README.md
index 75acb5ed..3c9c250d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
-
+
@@ -95,7 +95,7 @@ ContiNew Admin（Continue New Admin），页面现代美观，且专注设计与
```java
@Tag(name = "部门管理 API")
@RestController
-@CrudRequestMapping(value = "/system/dept", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE, Api.EXPORT, Api.DICT_TREE})
+@CrudRequestMapping(value = "/system/dept", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE, Api.EXPORT, Api.TREE_DICT})
public class DeptController extends BaseController {}
```
@@ -240,7 +240,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.13.4 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 |
+| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.14.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 |
| Spring Boot | 3.3.12 | 简化 Spring 应用的初始搭建和开发过程，基于“约定优于配置”的理念，使开发人员不再需要定义样板化的配置。（Spring Boot 3.0 开始，要求 Java 17 作为最低版本） |
| Undertow | 2.3.18.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 |
| Sa-Token + JWT | 1.44.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 |
diff --git a/continew-common/pom.xml b/continew-common/pom.xml
index 46e495e7..2a27cc71 100644
--- a/continew-common/pom.xml
+++ b/continew-common/pom.xml
@@ -108,10 +108,15 @@
continew-starter-auth-justauth
-
+
top.continew.starter
- continew-starter-security-crypto
+ continew-starter-encrypt-field
+
+
+
+ top.continew.starter
+ continew-starter-encrypt-password-encoder
diff --git a/continew-common/src/main/java/top/continew/admin/common/base/controller/BaseController.java b/continew-common/src/main/java/top/continew/admin/common/base/controller/BaseController.java
index 0567f433..175cbadf 100644
--- a/continew-common/src/main/java/top/continew/admin/common/base/controller/BaseController.java
+++ b/continew-common/src/main/java/top/continew/admin/common/base/controller/BaseController.java
@@ -74,7 +74,7 @@ public class BaseController, L, D, Q, C> exten
}
}
// 不需要校验 DICT、DICT_TREE 接口权限
- if (Api.DICT.equals(crudApi.value()) || Api.DICT_TREE.equals(crudApi.value())) {
+ if (Api.DICT.equals(crudApi.value()) || Api.TREE_DICT.equals(crudApi.value())) {
return;
}
// 校验权限，例如：创建用户接口（POST /system/user） => 校验 system:user:create 权限
diff --git a/continew-common/src/main/java/top/continew/admin/common/config/RsaProperties.java b/continew-common/src/main/java/top/continew/admin/common/config/RsaProperties.java
index 91d6d6b6..5158db2a 100644
--- a/continew-common/src/main/java/top/continew/admin/common/config/RsaProperties.java
+++ b/continew-common/src/main/java/top/continew/admin/common/config/RsaProperties.java
@@ -34,8 +34,8 @@ public class RsaProperties {
public static final String PUBLIC_KEY;
static {
- PRIVATE_KEY = SpringUtil.getProperty("continew-starter.security.crypto.private-key");
- PUBLIC_KEY = SpringUtil.getProperty("continew-starter.security.crypto.public-key");
+ PRIVATE_KEY = SpringUtil.getProperty("continew-starter.encrypt.field.private-key");
+ PUBLIC_KEY = SpringUtil.getProperty("continew-starter.encrypt.field.public-key");
}
private RsaProperties() {
diff --git a/continew-common/src/main/java/top/continew/admin/common/config/doc/OperationDescriptionCustomizer.java b/continew-common/src/main/java/top/continew/admin/common/config/doc/OperationDescriptionCustomizer.java
index 0c20b90d..6b6d65dc 100644
--- a/continew-common/src/main/java/top/continew/admin/common/config/doc/OperationDescriptionCustomizer.java
+++ b/continew-common/src/main/java/top/continew/admin/common/config/doc/OperationDescriptionCustomizer.java
@@ -171,7 +171,7 @@ public class OperationDescriptionCustomizer {
if (crudRequestMapping == null || crudApi == null) {
return StringConstants.EMPTY;
}
- if (Api.DICT.equals(crudApi.value()) || Api.DICT_TREE.equals(crudApi.value())) {
+ if (Api.DICT.equals(crudApi.value()) || Api.TREE_DICT.equals(crudApi.value())) {
return StringConstants.EMPTY;
}
String permissionPrefix = CrudApiPermissionPrefixCache.get(targetClass);
diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java
index 7c0d4b38..dc5d1873 100644
--- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java
+++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java
@@ -21,7 +21,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.continew.admin.open.model.entity.AppDO;
import top.continew.starter.data.mapper.BaseMapper;
-import top.continew.starter.security.crypto.annotation.FieldEncrypt;
+import top.continew.starter.encrypt.field.annotation.FieldEncrypt;
/**
* 应用 Mapper
diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java
index 41f66fc5..1e7de8c3 100644
--- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java
+++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java
@@ -18,9 +18,9 @@ package top.continew.admin.open.model.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.base.model.entity.BaseDO;
-import top.continew.starter.security.crypto.annotation.FieldEncrypt;
+import top.continew.admin.common.enums.DisEnableStatusEnum;
+import top.continew.starter.encrypt.field.annotation.FieldEncrypt;
import java.io.Serial;
import java.time.LocalDateTime;
diff --git a/continew-server/src/main/resources/config/application-dev.yml b/continew-server/src/main/resources/config/application-dev.yml
index 9c0662d5..ed79fc34 100644
--- a/continew-server/src/main/resources/config/application-dev.yml
+++ b/continew-server/src/main/resources/config/application-dev.yml
@@ -119,8 +119,14 @@ logging:
file:
path: ./logs
---- ### 安全配置：加/解密配置
-continew-starter.security.crypto:
+--- ### 加密配置：密码编码器配置
+continew-starter.encrypt.password-encoder:
+ enabled: true
+ # 默认启用的编码器算法（默认：BCrypt 加密算法）
+ algorithm: BCRYPT
+
+--- ### 加密配置：字段加/解密配置
+continew-starter.encrypt.field:
enabled: true
# 默认算法，即 @FieldEncrypt 默认采用的算法（默认：AES 对称加密算法）
algorithm: AES
@@ -129,11 +135,6 @@ continew-starter.security.crypto:
# 非对称加密算法密钥（在线生成 RSA 密钥对：http://web.chacuo.net/netrsakeypair）
public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM51dgYtMyF+tTQt80sfFOpSV27a7t9uaUVeFrdGiVxscuizE7H8SMntYqfn9lp8a5GH5P1/GGehVjUD2gF/4kcCAwEAAQ==
private-key: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAznV2Bi0zIX61NC3zSx8U6lJXbtru325pRV4Wt0aJXGxy6LMTsfxIye1ip+f2WnxrkYfk/X8YZ6FWNQPaAX/iRwIDAQABAkEAk/VcAusrpIqA5Ac2P5Tj0VX3cOuXmyouaVcXonr7f+6y2YTjLQuAnkcfKKocQI/juIRQBFQIqqW/m1nmz1wGeQIhAO8XaA/KxzOIgU0l/4lm0A2Wne6RokJ9HLs1YpOzIUmVAiEA3Q9DQrpAlIuiT1yWAGSxA9RxcjUM/1kdVLTkv0avXWsCIE0X8woEjK7lOSwzMG6RpEx9YHdopjViOj1zPVH61KTxAiBmv/dlhqkJ4rV46fIXELZur0pj6WC3N7a4brR8a+CLLQIhAMQyerWl2cPNVtE/8tkziHKbwW3ZUiBXU24wFxedT9iV
- ## 密码编码器配置
- password-encoder:
- enabled: true
- # 默认启用的编码器算法（默认：BCrypt 加密算法）
- algorithm: BCRYPT
--- ### 验证码配置
continew-starter.captcha:
diff --git a/continew-server/src/main/resources/config/application-prod.yml b/continew-server/src/main/resources/config/application-prod.yml
index 3d96220b..03218cbe 100644
--- a/continew-server/src/main/resources/config/application-prod.yml
+++ b/continew-server/src/main/resources/config/application-prod.yml
@@ -128,8 +128,14 @@ logging:
file:
path: ../logs
---- ### 安全配置：加/解密配置
-continew-starter.security.crypto:
+--- ### 加密配置：密码编码器配置
+continew-starter.encrypt.password-encoder:
+ enabled: true
+ # 默认启用的编码器算法（默认：BCrypt 加密算法）
+ algorithm: BCRYPT
+
+--- ### 加密配置：字段加/解密配置
+continew-starter.encrypt.field:
enabled: true
# 默认算法，即 @FieldEncrypt 默认采用的算法（默认：AES 对称加密算法）
algorithm: AES
@@ -138,11 +144,6 @@ continew-starter.security.crypto:
# 非对称加密算法密钥（在线生成 RSA 密钥对：http://web.chacuo.net/netrsakeypair）
public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM51dgYtMyF+tTQt80sfFOpSV27a7t9uaUVeFrdGiVxscuizE7H8SMntYqfn9lp8a5GH5P1/GGehVjUD2gF/4kcCAwEAAQ==
private-key: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAznV2Bi0zIX61NC3zSx8U6lJXbtru325pRV4Wt0aJXGxy6LMTsfxIye1ip+f2WnxrkYfk/X8YZ6FWNQPaAX/iRwIDAQABAkEAk/VcAusrpIqA5Ac2P5Tj0VX3cOuXmyouaVcXonr7f+6y2YTjLQuAnkcfKKocQI/juIRQBFQIqqW/m1nmz1wGeQIhAO8XaA/KxzOIgU0l/4lm0A2Wne6RokJ9HLs1YpOzIUmVAiEA3Q9DQrpAlIuiT1yWAGSxA9RxcjUM/1kdVLTkv0avXWsCIE0X8woEjK7lOSwzMG6RpEx9YHdopjViOj1zPVH61KTxAiBmv/dlhqkJ4rV46fIXELZur0pj6WC3N7a4brR8a+CLLQIhAMQyerWl2cPNVtE/8tkziHKbwW3ZUiBXU24wFxedT9iV
- ## 密码编码器配置
- password-encoder:
- enabled: true
- # 默认启用的编码器算法（默认：BCrypt 加密算法）
- algorithm: BCRYPT
--- ### 验证码配置
continew-starter.captcha:
diff --git a/continew-server/src/main/resources/config/application.yml b/continew-server/src/main/resources/config/application.yml
index 2489b386..20737c39 100644
--- a/continew-server/src/main/resources/config/application.yml
+++ b/continew-server/src/main/resources/config/application.yml
@@ -7,7 +7,7 @@ application:
description: 持续迭代优化的前后端分离中后台管理系统框架，开箱即用，持续提供舒适的开发体验。
# 版本
version: 4.1.0-SNAPSHOT
- starter: 2.13.4
+ starter: 2.14.0
# 基本包
base-package: top.continew.admin
## 作者信息配置
@@ -182,8 +182,8 @@ continew-starter.trace:
--- ### CRUD 配置
continew-starter.crud:
- ## 全局树结构配置（简单树，对应前端 UI）
- tree:
+ ## 树型字典结构映射配置（简单树，对应前端 UI）
+ tree-dict-model:
id-key: key
name-key: title
weight-key: sort
diff --git a/continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java b/continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java
index ef94f6da..2111209f 100644
--- a/continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java
@@ -104,7 +104,7 @@ public class AuthServiceImpl implements AuthService {
}
// 构建路由树
TreeField treeField = MenuResp.class.getDeclaredAnnotation(TreeField.class);
- TreeNodeConfig treeNodeConfig = crudProperties.getTree().genTreeNodeConfig(treeField);
+ TreeNodeConfig treeNodeConfig = crudProperties.getTreeDictModel().genTreeNodeConfig(treeField);
List> treeList = TreeUtil.build(menuList, treeField.rootId(), treeNodeConfig, (m, tree) -> {
tree.setId(m.getId());
tree.setParentId(m.getParentId());
diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java b/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java
index c5b28f1f..39a36e2f 100644
--- a/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java
+++ b/continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java
@@ -35,6 +35,6 @@ import top.continew.starter.extension.crud.enums.Api;
@Tag(name = "部门管理 API")
@RestController
@CrudRequestMapping(value = "/system/dept", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE,
- Api.EXPORT, Api.DICT_TREE})
+ Api.EXPORT, Api.TREE_DICT})
public class DeptController extends BaseController {
}
diff --git a/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java b/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java
index c176ec3e..8f1a9b82 100644
--- a/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java
+++ b/continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java
@@ -50,7 +50,7 @@ import java.lang.reflect.Method;
@RestController
@RequiredArgsConstructor
@CrudRequestMapping(value = "/system/menu", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE,
- Api.DICT_TREE})
+ Api.TREE_DICT})
public class MenuController extends BaseController {
@Operation(summary = "清除缓存", description = "清除缓存")
diff --git a/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java b/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java
index 4a926588..7958d17c 100644
--- a/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java
+++ b/continew-system/src/main/java/top/continew/admin/system/mapper/user/UserMapper.java
@@ -26,7 +26,7 @@ import top.continew.admin.common.base.mapper.DataPermissionMapper;
import top.continew.admin.system.model.entity.user.UserDO;
import top.continew.admin.system.model.resp.user.UserDetailResp;
import top.continew.starter.extension.datapermission.annotation.DataPermission;
-import top.continew.starter.security.crypto.annotation.FieldEncrypt;
+import top.continew.starter.encrypt.field.annotation.FieldEncrypt;
import java.util.List;
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsConfigDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsConfigDO.java
index 1346fd10..df1f7cc4 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsConfigDO.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/SmsConfigDO.java
@@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.base.model.entity.BaseDO;
-import top.continew.starter.security.crypto.annotation.FieldEncrypt;
+import top.continew.starter.encrypt.field.annotation.FieldEncrypt;
import java.io.Serial;
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
index 3a61f589..370a1a82 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java
@@ -26,7 +26,7 @@ import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.base.model.entity.BaseDO;
import top.continew.admin.system.enums.StorageTypeEnum;
import top.continew.starter.core.constant.StringConstants;
-import top.continew.starter.security.crypto.annotation.FieldEncrypt;
+import top.continew.starter.encrypt.field.annotation.FieldEncrypt;
import java.io.Serial;
import java.net.URL;
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java b/continew-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java
index 13e1d67a..c6e160f3 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/entity/user/UserDO.java
@@ -23,9 +23,9 @@ import lombok.Data;
import top.continew.admin.common.base.model.entity.BaseDO;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.enums.GenderEnum;
+import top.continew.starter.encrypt.field.annotation.FieldEncrypt;
+import top.continew.starter.encrypt.password.encoder.encryptor.PasswordEncoderEncryptor;
import top.continew.starter.extension.crud.annotation.DictModel;
-import top.continew.starter.security.crypto.annotation.FieldEncrypt;
-import top.continew.starter.security.crypto.enums.Algorithm;
import java.io.Serial;
import java.time.LocalDateTime;
@@ -57,7 +57,7 @@ public class UserDO extends BaseDO {
/**
* 密码
*/
- @FieldEncrypt(Algorithm.PASSWORD_ENCODER)
+ @FieldEncrypt(encryptor = PasswordEncoderEncryptor.class)
private String password;
/**
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java
index ed2e2caf..862a85ba 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java
@@ -44,6 +44,7 @@ public class ClientQuery implements Serializable {
* 客户端类型
*/
@Schema(description = "客户端类型", example = "PC")
+ @Query(type = QueryType.EQ)
private String clientType;
/**
@@ -57,5 +58,6 @@ public class ClientQuery implements Serializable {
* 状态
*/
@Schema(description = "状态", example = "1")
+ @Query(type = QueryType.EQ)
private DisEnableStatusEnum status;
}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java
index c70b45f4..85725bd6 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java
@@ -49,5 +49,6 @@ public class DeptQuery implements Serializable {
* 状态
*/
@Schema(description = "状态", example = "1")
+ @Query(type = QueryType.EQ)
private DisEnableStatusEnum status;
}
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java
index 1df8c613..c030d14d 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java
@@ -49,11 +49,13 @@ public class DictItemQuery implements Serializable {
* 状态
*/
@Schema(description = "状态", example = "1")
+ @Query(type = QueryType.EQ)
private DisEnableStatusEnum status;
/**
* 字典 ID
*/
@Schema(description = "字典 ID")
+ @Query(type = QueryType.EQ)
private Long dictId;
}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java
index 4d457a6b..f7ee2bf1 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java
@@ -49,11 +49,13 @@ public class FileQuery implements Serializable {
* 上级目录
*/
@Schema(description = "上级目录", example = "/")
+ @Query(type = QueryType.EQ)
private String parentPath;
/**
* 类型
*/
@Schema(description = "类型", example = "2")
+ @Query(type = QueryType.EQ)
private FileTypeEnum type;
}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java
index 49881c19..ff905119 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java
@@ -52,6 +52,7 @@ public class MenuQuery implements Serializable {
* 状态
*/
@Schema(description = "状态", example = "1")
+ @Query(type = QueryType.EQ)
private DisEnableStatusEnum status;
public MenuQuery(DisEnableStatusEnum status) {
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java
index 73ad2c85..ac793733 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java
@@ -51,6 +51,7 @@ public class OptionQuery implements Serializable {
* 类别
*/
@Schema(description = "类别", example = "SITE")
+ @Query(type = QueryType.EQ)
@EnumValue(value = OptionCategoryEnum.class, message = "类别无效")
private String category;
}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/SmsConfigQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/SmsConfigQuery.java
index 359fb35d..5bbdd14c 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/SmsConfigQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/SmsConfigQuery.java
@@ -50,19 +50,20 @@ public class SmsConfigQuery implements Serializable {
* 厂商
*/
@Schema(description = "厂商", example = "cloopen")
- @Query
+ @Query(type = QueryType.EQ)
private String supplier;
/**
* Access Key
*/
@Schema(description = "Access Key", example = "7aaf0708674db3ee05676ecbc2f31b7b")
- @Query
+ @Query(type = QueryType.EQ)
private String accessKey;
/**
* 状态
*/
@Schema(description = "状态", example = "1")
+ @Query(type = QueryType.EQ)
private DisEnableStatusEnum status;
}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/SmsLogQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/SmsLogQuery.java
index edaa5b0e..f224ce8a 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/SmsLogQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/SmsLogQuery.java
@@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.common.enums.SuccessFailureStatusEnum;
import top.continew.starter.data.annotation.Query;
+import top.continew.starter.data.enums.QueryType;
import java.io.Serial;
import java.io.Serializable;
@@ -42,20 +43,20 @@ public class SmsLogQuery implements Serializable {
* 配置 ID
*/
@Schema(description = "配置 ID", example = "1")
- @Query
+ @Query(type = QueryType.EQ)
private Long configId;
/**
* 手机号
*/
@Schema(description = "手机号", example = "18888888888")
- @Query
+ @Query(type = QueryType.EQ)
private String phone;
/**
* 发送状态
*/
@Schema(description = "发送状态", example = "1")
- @Query
+ @Query(type = QueryType.EQ)
private SuccessFailureStatusEnum status;
}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java b/continew-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java
index 3f93088f..be983054 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java
@@ -50,11 +50,13 @@ public class StorageQuery implements Serializable {
* 状态
*/
@Schema(description = "状态", example = "1")
+ @Query(type = QueryType.EQ)
private DisEnableStatusEnum status;
/**
* 类型
*/
@Schema(description = "类型", example = "2")
+ @Query(type = QueryType.EQ)
private StorageTypeEnum type;
}
\ No newline at end of file
diff --git a/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java b/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java
index 3162e3f4..a3a904f7 100644
--- a/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java
+++ b/continew-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java
@@ -36,7 +36,7 @@ import top.continew.admin.system.model.resp.DeptResp;
import top.continew.admin.system.service.DeptService;
import top.continew.starter.excel.converter.ExcelBaseEnumConverter;
import top.continew.starter.excel.converter.ExcelListConverter;
-import top.continew.starter.security.crypto.annotation.FieldEncrypt;
+import top.continew.starter.encrypt.field.annotation.FieldEncrypt;
import java.io.Serial;
import java.time.LocalDateTime;
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
index 08332c19..9c9a15da 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
@@ -290,7 +290,8 @@ public class FileServiceImpl extends BaseServiceImpl user、avatar
- String[] parentPathParts = StrUtil.split(parentPath, StringConstants.SLASH, false, true).toArray(String[]::new);
+ String[] parentPathParts = StrUtil.split(parentPath, StringConstants.SLASH, false, true)
+ .toArray(String[]::new);
String lastPath = StringConstants.SLASH;
StringBuilder currentPathBuilder = new StringBuilder();
for (int i = 0; i < parentPathParts.length; i++) {
diff --git a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
index b360b566..c9139a0a 100644
--- a/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
@@ -80,10 +80,10 @@ import top.continew.starter.core.exception.BusinessException;
import top.continew.starter.core.util.CollUtils;
import top.continew.starter.core.util.FileUploadUtils;
import top.continew.starter.core.util.validation.CheckUtils;
+import top.continew.starter.encrypt.field.util.EncryptHelper;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.query.SortQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
-import top.continew.starter.security.crypto.util.EncryptHelper;
import java.io.IOException;
import java.time.Duration;
diff --git a/pom.xml b/pom.xml
index 6ebe0813..56f633d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
top.continew.starter
continew-starter
- 2.13.4
+ 2.14.0
top.continew.admin