mirror of
https://github.com/continew-org/continew-admin.git
synced 2025-10-19 20:57:21 +08:00
build: continew-starter 2.13.4 => 2.14.0
1.适配 cs security-crypto 模块拆分及包名调整,重新引入密码编码器模块 2.适配 cs 树型结构字典配置命名调整 DICT_TREE -> TREE_DICT 3.cs QueryIgnore 已移除,自行处理所有 Query 参数 4.cs 修复多租户下开启多数据源拦截器返回结果异常的情况 5.cs 修复邮箱发送错误
This commit is contained in:
2
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
2
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@@ -6,7 +6,7 @@ body:
|
|||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
value: |
|
value: |
|
||||||
感谢您使用 ContiNew Admin!请您花些时间填写这份 Bug 报告。
|
感谢您使用 ContiNew Admin!请您花些时间填写这份 Bug 报告。**温馨提示:我们利用业余时间维护开源项目,没有额外精力及人员维护已发布版本,所以请务必检查最新版本是否正常,如已修复请自行跟进修复!**
|
||||||
- type: checkboxes
|
- type: checkboxes
|
||||||
id: checkboxes
|
id: checkboxes
|
||||||
attributes:
|
attributes:
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
<img src="https://img.shields.io/badge/SNAPSHOT-v4.1.0-%23ff3f59.svg" alt="Release" />
|
<img src="https://img.shields.io/badge/SNAPSHOT-v4.1.0-%23ff3f59.svg" alt="Release" />
|
||||||
</a>
|
</a>
|
||||||
<a href="https://github.com/continew-org/continew-starter" title="ContiNew Starter" target="_blank">
|
<a href="https://github.com/continew-org/continew-starter" title="ContiNew Starter" target="_blank">
|
||||||
<img src="https://img.shields.io/badge/ContiNew Starter-2.13.4-%236CB52D.svg" alt="ContiNew Starter" />
|
<img src="https://img.shields.io/badge/ContiNew Starter-2.14.0-%236CB52D.svg" alt="ContiNew Starter" />
|
||||||
</a>
|
</a>
|
||||||
<a href="https://spring.io/projects/spring-boot" title="Spring Boot" target="_blank">
|
<a href="https://spring.io/projects/spring-boot" title="Spring Boot" target="_blank">
|
||||||
<img src="https://img.shields.io/badge/Spring Boot-3.3.12-%236CB52D.svg?logo=Spring-Boot" alt="Spring Boot" />
|
<img src="https://img.shields.io/badge/Spring Boot-3.3.12-%236CB52D.svg?logo=Spring-Boot" alt="Spring Boot" />
|
||||||
@@ -95,7 +95,7 @@ ContiNew Admin(Continue New Admin),页面现代美观,且专注设计与
|
|||||||
```java
|
```java
|
||||||
@Tag(name = "部门管理 API")
|
@Tag(name = "部门管理 API")
|
||||||
@RestController
|
@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<DeptService, DeptResp, DeptDetailResp, DeptQuery, DeptReq> {}
|
public class DeptController extends BaseController<DeptService, DeptResp, DeptDetailResp, DeptQuery, DeptReq> {}
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -240,7 +240,7 @@ public class DeptController extends BaseController<DeptService, DeptResp, DeptDe
|
|||||||
| <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design</a> | 2.57.0 | 字节跳动推出的前端 UI 框架,年轻化的色彩和组件设计。 |
|
| <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design</a> | 2.57.0 | 字节跳动推出的前端 UI 框架,年轻化的色彩和组件设计。 |
|
||||||
| <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 5.0.4 | TypeScript 是微软开发的一个开源的编程语言,通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
|
| <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 | 下一代的前端工具链,为开发提供极速响应。 |
|
| <a href="https://vite.dev/" target="_blank">Vite</a> | 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 项目的灵活快速构建提供支持。 |
|
||||||
| <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a> | 3.3.12 | 简化 Spring 应用的初始搭建和开发过程,基于“约定优于配置”的理念,使开发人员不再需要定义样板化的配置。(Spring Boot 3.0 开始,要求 Java 17 作为最低版本) |
|
| <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a> | 3.3.12 | 简化 Spring 应用的初始搭建和开发过程,基于“约定优于配置”的理念,使开发人员不再需要定义样板化的配置。(Spring Boot 3.0 开始,要求 Java 17 作为最低版本) |
|
||||||
| <a href="https://undertow.io/" target="_blank">Undertow</a> | 2.3.18.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 |
|
| <a href="https://undertow.io/" target="_blank">Undertow</a> | 2.3.18.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 |
|
||||||
| <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a> | 1.44.0 | 轻量级 Java 权限认证框架,让鉴权变得简单、优雅。 |
|
| <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a> | 1.44.0 | 轻量级 Java 权限认证框架,让鉴权变得简单、优雅。 |
|
||||||
|
@@ -108,10 +108,15 @@
|
|||||||
<artifactId>continew-starter-auth-justauth</artifactId>
|
<artifactId>continew-starter-auth-justauth</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- ContiNew Starter 安全模块 - 加密 -->
|
<!-- ContiNew Starter 加密模块 - 字段加密 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>top.continew.starter</groupId>
|
<groupId>top.continew.starter</groupId>
|
||||||
<artifactId>continew-starter-security-crypto</artifactId>
|
<artifactId>continew-starter-encrypt-field</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- ContiNew Starter 加密模块 - 密码编码器 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>top.continew.starter</groupId>
|
||||||
|
<artifactId>continew-starter-encrypt-password-encoder</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- ContiNew Starter 安全模块 - 脱敏 -->
|
<!-- ContiNew Starter 安全模块 - 脱敏 -->
|
||||||
|
@@ -74,7 +74,7 @@ public class BaseController<S extends BaseService<L, D, Q, C>, L, D, Q, C> exten
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 不需要校验 DICT、DICT_TREE 接口权限
|
// 不需要校验 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;
|
return;
|
||||||
}
|
}
|
||||||
// 校验权限,例如:创建用户接口(POST /system/user) => 校验 system:user:create 权限
|
// 校验权限,例如:创建用户接口(POST /system/user) => 校验 system:user:create 权限
|
||||||
|
@@ -34,8 +34,8 @@ public class RsaProperties {
|
|||||||
public static final String PUBLIC_KEY;
|
public static final String PUBLIC_KEY;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
PRIVATE_KEY = SpringUtil.getProperty("continew-starter.security.crypto.private-key");
|
PRIVATE_KEY = SpringUtil.getProperty("continew-starter.encrypt.field.private-key");
|
||||||
PUBLIC_KEY = SpringUtil.getProperty("continew-starter.security.crypto.public-key");
|
PUBLIC_KEY = SpringUtil.getProperty("continew-starter.encrypt.field.public-key");
|
||||||
}
|
}
|
||||||
|
|
||||||
private RsaProperties() {
|
private RsaProperties() {
|
||||||
|
@@ -171,7 +171,7 @@ public class OperationDescriptionCustomizer {
|
|||||||
if (crudRequestMapping == null || crudApi == null) {
|
if (crudRequestMapping == null || crudApi == null) {
|
||||||
return StringConstants.EMPTY;
|
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;
|
return StringConstants.EMPTY;
|
||||||
}
|
}
|
||||||
String permissionPrefix = CrudApiPermissionPrefixCache.get(targetClass);
|
String permissionPrefix = CrudApiPermissionPrefixCache.get(targetClass);
|
||||||
|
@@ -21,7 +21,7 @@ import org.apache.ibatis.annotations.Param;
|
|||||||
import org.apache.ibatis.annotations.Select;
|
import org.apache.ibatis.annotations.Select;
|
||||||
import top.continew.admin.open.model.entity.AppDO;
|
import top.continew.admin.open.model.entity.AppDO;
|
||||||
import top.continew.starter.data.mapper.BaseMapper;
|
import top.continew.starter.data.mapper.BaseMapper;
|
||||||
import top.continew.starter.security.crypto.annotation.FieldEncrypt;
|
import top.continew.starter.encrypt.field.annotation.FieldEncrypt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 应用 Mapper
|
* 应用 Mapper
|
||||||
|
@@ -18,9 +18,9 @@ package top.continew.admin.open.model.entity;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import top.continew.admin.common.enums.DisEnableStatusEnum;
|
|
||||||
import top.continew.admin.common.base.model.entity.BaseDO;
|
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.io.Serial;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
@@ -119,8 +119,14 @@ logging:
|
|||||||
file:
|
file:
|
||||||
path: ./logs
|
path: ./logs
|
||||||
|
|
||||||
--- ### 安全配置:加/解密配置
|
--- ### 加密配置:密码编码器配置
|
||||||
continew-starter.security.crypto:
|
continew-starter.encrypt.password-encoder:
|
||||||
|
enabled: true
|
||||||
|
# 默认启用的编码器算法(默认:BCrypt 加密算法)
|
||||||
|
algorithm: BCRYPT
|
||||||
|
|
||||||
|
--- ### 加密配置:字段加/解密配置
|
||||||
|
continew-starter.encrypt.field:
|
||||||
enabled: true
|
enabled: true
|
||||||
# 默认算法,即 @FieldEncrypt 默认采用的算法(默认:AES 对称加密算法)
|
# 默认算法,即 @FieldEncrypt 默认采用的算法(默认:AES 对称加密算法)
|
||||||
algorithm: AES
|
algorithm: AES
|
||||||
@@ -129,11 +135,6 @@ continew-starter.security.crypto:
|
|||||||
# 非对称加密算法密钥(在线生成 RSA 密钥对:http://web.chacuo.net/netrsakeypair)
|
# 非对称加密算法密钥(在线生成 RSA 密钥对:http://web.chacuo.net/netrsakeypair)
|
||||||
public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM51dgYtMyF+tTQt80sfFOpSV27a7t9uaUVeFrdGiVxscuizE7H8SMntYqfn9lp8a5GH5P1/GGehVjUD2gF/4kcCAwEAAQ==
|
public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM51dgYtMyF+tTQt80sfFOpSV27a7t9uaUVeFrdGiVxscuizE7H8SMntYqfn9lp8a5GH5P1/GGehVjUD2gF/4kcCAwEAAQ==
|
||||||
private-key: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAznV2Bi0zIX61NC3zSx8U6lJXbtru325pRV4Wt0aJXGxy6LMTsfxIye1ip+f2WnxrkYfk/X8YZ6FWNQPaAX/iRwIDAQABAkEAk/VcAusrpIqA5Ac2P5Tj0VX3cOuXmyouaVcXonr7f+6y2YTjLQuAnkcfKKocQI/juIRQBFQIqqW/m1nmz1wGeQIhAO8XaA/KxzOIgU0l/4lm0A2Wne6RokJ9HLs1YpOzIUmVAiEA3Q9DQrpAlIuiT1yWAGSxA9RxcjUM/1kdVLTkv0avXWsCIE0X8woEjK7lOSwzMG6RpEx9YHdopjViOj1zPVH61KTxAiBmv/dlhqkJ4rV46fIXELZur0pj6WC3N7a4brR8a+CLLQIhAMQyerWl2cPNVtE/8tkziHKbwW3ZUiBXU24wFxedT9iV
|
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:
|
continew-starter.captcha:
|
||||||
|
@@ -128,8 +128,14 @@ logging:
|
|||||||
file:
|
file:
|
||||||
path: ../logs
|
path: ../logs
|
||||||
|
|
||||||
--- ### 安全配置:加/解密配置
|
--- ### 加密配置:密码编码器配置
|
||||||
continew-starter.security.crypto:
|
continew-starter.encrypt.password-encoder:
|
||||||
|
enabled: true
|
||||||
|
# 默认启用的编码器算法(默认:BCrypt 加密算法)
|
||||||
|
algorithm: BCRYPT
|
||||||
|
|
||||||
|
--- ### 加密配置:字段加/解密配置
|
||||||
|
continew-starter.encrypt.field:
|
||||||
enabled: true
|
enabled: true
|
||||||
# 默认算法,即 @FieldEncrypt 默认采用的算法(默认:AES 对称加密算法)
|
# 默认算法,即 @FieldEncrypt 默认采用的算法(默认:AES 对称加密算法)
|
||||||
algorithm: AES
|
algorithm: AES
|
||||||
@@ -138,11 +144,6 @@ continew-starter.security.crypto:
|
|||||||
# 非对称加密算法密钥(在线生成 RSA 密钥对:http://web.chacuo.net/netrsakeypair)
|
# 非对称加密算法密钥(在线生成 RSA 密钥对:http://web.chacuo.net/netrsakeypair)
|
||||||
public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM51dgYtMyF+tTQt80sfFOpSV27a7t9uaUVeFrdGiVxscuizE7H8SMntYqfn9lp8a5GH5P1/GGehVjUD2gF/4kcCAwEAAQ==
|
public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAM51dgYtMyF+tTQt80sfFOpSV27a7t9uaUVeFrdGiVxscuizE7H8SMntYqfn9lp8a5GH5P1/GGehVjUD2gF/4kcCAwEAAQ==
|
||||||
private-key: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAznV2Bi0zIX61NC3zSx8U6lJXbtru325pRV4Wt0aJXGxy6LMTsfxIye1ip+f2WnxrkYfk/X8YZ6FWNQPaAX/iRwIDAQABAkEAk/VcAusrpIqA5Ac2P5Tj0VX3cOuXmyouaVcXonr7f+6y2YTjLQuAnkcfKKocQI/juIRQBFQIqqW/m1nmz1wGeQIhAO8XaA/KxzOIgU0l/4lm0A2Wne6RokJ9HLs1YpOzIUmVAiEA3Q9DQrpAlIuiT1yWAGSxA9RxcjUM/1kdVLTkv0avXWsCIE0X8woEjK7lOSwzMG6RpEx9YHdopjViOj1zPVH61KTxAiBmv/dlhqkJ4rV46fIXELZur0pj6WC3N7a4brR8a+CLLQIhAMQyerWl2cPNVtE/8tkziHKbwW3ZUiBXU24wFxedT9iV
|
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:
|
continew-starter.captcha:
|
||||||
|
@@ -7,7 +7,7 @@ application:
|
|||||||
description: 持续迭代优化的前后端分离中后台管理系统框架,开箱即用,持续提供舒适的开发体验。
|
description: 持续迭代优化的前后端分离中后台管理系统框架,开箱即用,持续提供舒适的开发体验。
|
||||||
# 版本
|
# 版本
|
||||||
version: 4.1.0-SNAPSHOT
|
version: 4.1.0-SNAPSHOT
|
||||||
starter: 2.13.4
|
starter: 2.14.0
|
||||||
# 基本包
|
# 基本包
|
||||||
base-package: top.continew.admin
|
base-package: top.continew.admin
|
||||||
## 作者信息配置
|
## 作者信息配置
|
||||||
@@ -182,8 +182,8 @@ continew-starter.trace:
|
|||||||
|
|
||||||
--- ### CRUD 配置
|
--- ### CRUD 配置
|
||||||
continew-starter.crud:
|
continew-starter.crud:
|
||||||
## 全局树结构配置(简单树,对应前端 UI)
|
## 树型字典结构映射配置(简单树,对应前端 UI)
|
||||||
tree:
|
tree-dict-model:
|
||||||
id-key: key
|
id-key: key
|
||||||
name-key: title
|
name-key: title
|
||||||
weight-key: sort
|
weight-key: sort
|
||||||
|
@@ -104,7 +104,7 @@ public class AuthServiceImpl implements AuthService {
|
|||||||
}
|
}
|
||||||
// 构建路由树
|
// 构建路由树
|
||||||
TreeField treeField = MenuResp.class.getDeclaredAnnotation(TreeField.class);
|
TreeField treeField = MenuResp.class.getDeclaredAnnotation(TreeField.class);
|
||||||
TreeNodeConfig treeNodeConfig = crudProperties.getTree().genTreeNodeConfig(treeField);
|
TreeNodeConfig treeNodeConfig = crudProperties.getTreeDictModel().genTreeNodeConfig(treeField);
|
||||||
List<Tree<Long>> treeList = TreeUtil.build(menuList, treeField.rootId(), treeNodeConfig, (m, tree) -> {
|
List<Tree<Long>> treeList = TreeUtil.build(menuList, treeField.rootId(), treeNodeConfig, (m, tree) -> {
|
||||||
tree.setId(m.getId());
|
tree.setId(m.getId());
|
||||||
tree.setParentId(m.getParentId());
|
tree.setParentId(m.getParentId());
|
||||||
|
@@ -35,6 +35,6 @@ import top.continew.starter.extension.crud.enums.Api;
|
|||||||
@Tag(name = "部门管理 API")
|
@Tag(name = "部门管理 API")
|
||||||
@RestController
|
@RestController
|
||||||
@CrudRequestMapping(value = "/system/dept", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE,
|
@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<DeptService, DeptResp, DeptResp, DeptQuery, DeptReq> {
|
public class DeptController extends BaseController<DeptService, DeptResp, DeptResp, DeptQuery, DeptReq> {
|
||||||
}
|
}
|
||||||
|
@@ -50,7 +50,7 @@ import java.lang.reflect.Method;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@CrudRequestMapping(value = "/system/menu", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE,
|
@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<MenuService, MenuResp, MenuResp, MenuQuery, MenuReq> {
|
public class MenuController extends BaseController<MenuService, MenuResp, MenuResp, MenuQuery, MenuReq> {
|
||||||
|
|
||||||
@Operation(summary = "清除缓存", description = "清除缓存")
|
@Operation(summary = "清除缓存", description = "清除缓存")
|
||||||
|
@@ -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.entity.user.UserDO;
|
||||||
import top.continew.admin.system.model.resp.user.UserDetailResp;
|
import top.continew.admin.system.model.resp.user.UserDetailResp;
|
||||||
import top.continew.starter.extension.datapermission.annotation.DataPermission;
|
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;
|
import java.util.List;
|
||||||
|
|
||||||
|
@@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import top.continew.admin.common.enums.DisEnableStatusEnum;
|
import top.continew.admin.common.enums.DisEnableStatusEnum;
|
||||||
import top.continew.admin.common.base.model.entity.BaseDO;
|
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;
|
import java.io.Serial;
|
||||||
|
|
||||||
|
@@ -26,7 +26,7 @@ import top.continew.admin.common.enums.DisEnableStatusEnum;
|
|||||||
import top.continew.admin.common.base.model.entity.BaseDO;
|
import top.continew.admin.common.base.model.entity.BaseDO;
|
||||||
import top.continew.admin.system.enums.StorageTypeEnum;
|
import top.continew.admin.system.enums.StorageTypeEnum;
|
||||||
import top.continew.starter.core.constant.StringConstants;
|
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.io.Serial;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
@@ -23,9 +23,9 @@ import lombok.Data;
|
|||||||
import top.continew.admin.common.base.model.entity.BaseDO;
|
import top.continew.admin.common.base.model.entity.BaseDO;
|
||||||
import top.continew.admin.common.enums.DisEnableStatusEnum;
|
import top.continew.admin.common.enums.DisEnableStatusEnum;
|
||||||
import top.continew.admin.common.enums.GenderEnum;
|
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.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.io.Serial;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -57,7 +57,7 @@ public class UserDO extends BaseDO {
|
|||||||
/**
|
/**
|
||||||
* 密码
|
* 密码
|
||||||
*/
|
*/
|
||||||
@FieldEncrypt(Algorithm.PASSWORD_ENCODER)
|
@FieldEncrypt(encryptor = PasswordEncoderEncryptor.class)
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -44,6 +44,7 @@ public class ClientQuery implements Serializable {
|
|||||||
* 客户端类型
|
* 客户端类型
|
||||||
*/
|
*/
|
||||||
@Schema(description = "客户端类型", example = "PC")
|
@Schema(description = "客户端类型", example = "PC")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private String clientType;
|
private String clientType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -57,5 +58,6 @@ public class ClientQuery implements Serializable {
|
|||||||
* 状态
|
* 状态
|
||||||
*/
|
*/
|
||||||
@Schema(description = "状态", example = "1")
|
@Schema(description = "状态", example = "1")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private DisEnableStatusEnum status;
|
private DisEnableStatusEnum status;
|
||||||
}
|
}
|
@@ -49,5 +49,6 @@ public class DeptQuery implements Serializable {
|
|||||||
* 状态
|
* 状态
|
||||||
*/
|
*/
|
||||||
@Schema(description = "状态", example = "1")
|
@Schema(description = "状态", example = "1")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private DisEnableStatusEnum status;
|
private DisEnableStatusEnum status;
|
||||||
}
|
}
|
||||||
|
@@ -49,11 +49,13 @@ public class DictItemQuery implements Serializable {
|
|||||||
* 状态
|
* 状态
|
||||||
*/
|
*/
|
||||||
@Schema(description = "状态", example = "1")
|
@Schema(description = "状态", example = "1")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private DisEnableStatusEnum status;
|
private DisEnableStatusEnum status;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 字典 ID
|
* 字典 ID
|
||||||
*/
|
*/
|
||||||
@Schema(description = "字典 ID")
|
@Schema(description = "字典 ID")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private Long dictId;
|
private Long dictId;
|
||||||
}
|
}
|
@@ -49,11 +49,13 @@ public class FileQuery implements Serializable {
|
|||||||
* 上级目录
|
* 上级目录
|
||||||
*/
|
*/
|
||||||
@Schema(description = "上级目录", example = "/")
|
@Schema(description = "上级目录", example = "/")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private String parentPath;
|
private String parentPath;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类型
|
* 类型
|
||||||
*/
|
*/
|
||||||
@Schema(description = "类型", example = "2")
|
@Schema(description = "类型", example = "2")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private FileTypeEnum type;
|
private FileTypeEnum type;
|
||||||
}
|
}
|
@@ -52,6 +52,7 @@ public class MenuQuery implements Serializable {
|
|||||||
* 状态
|
* 状态
|
||||||
*/
|
*/
|
||||||
@Schema(description = "状态", example = "1")
|
@Schema(description = "状态", example = "1")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private DisEnableStatusEnum status;
|
private DisEnableStatusEnum status;
|
||||||
|
|
||||||
public MenuQuery(DisEnableStatusEnum status) {
|
public MenuQuery(DisEnableStatusEnum status) {
|
||||||
|
@@ -51,6 +51,7 @@ public class OptionQuery implements Serializable {
|
|||||||
* 类别
|
* 类别
|
||||||
*/
|
*/
|
||||||
@Schema(description = "类别", example = "SITE")
|
@Schema(description = "类别", example = "SITE")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
@EnumValue(value = OptionCategoryEnum.class, message = "类别无效")
|
@EnumValue(value = OptionCategoryEnum.class, message = "类别无效")
|
||||||
private String category;
|
private String category;
|
||||||
}
|
}
|
@@ -50,19 +50,20 @@ public class SmsConfigQuery implements Serializable {
|
|||||||
* 厂商
|
* 厂商
|
||||||
*/
|
*/
|
||||||
@Schema(description = "厂商", example = "cloopen")
|
@Schema(description = "厂商", example = "cloopen")
|
||||||
@Query
|
@Query(type = QueryType.EQ)
|
||||||
private String supplier;
|
private String supplier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Access Key
|
* Access Key
|
||||||
*/
|
*/
|
||||||
@Schema(description = "Access Key", example = "7aaf0708674db3ee05676ecbc2f31b7b")
|
@Schema(description = "Access Key", example = "7aaf0708674db3ee05676ecbc2f31b7b")
|
||||||
@Query
|
@Query(type = QueryType.EQ)
|
||||||
private String accessKey;
|
private String accessKey;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 状态
|
* 状态
|
||||||
*/
|
*/
|
||||||
@Schema(description = "状态", example = "1")
|
@Schema(description = "状态", example = "1")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private DisEnableStatusEnum status;
|
private DisEnableStatusEnum status;
|
||||||
}
|
}
|
@@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import top.continew.admin.common.enums.SuccessFailureStatusEnum;
|
import top.continew.admin.common.enums.SuccessFailureStatusEnum;
|
||||||
import top.continew.starter.data.annotation.Query;
|
import top.continew.starter.data.annotation.Query;
|
||||||
|
import top.continew.starter.data.enums.QueryType;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@@ -42,20 +43,20 @@ public class SmsLogQuery implements Serializable {
|
|||||||
* 配置 ID
|
* 配置 ID
|
||||||
*/
|
*/
|
||||||
@Schema(description = "配置 ID", example = "1")
|
@Schema(description = "配置 ID", example = "1")
|
||||||
@Query
|
@Query(type = QueryType.EQ)
|
||||||
private Long configId;
|
private Long configId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 手机号
|
* 手机号
|
||||||
*/
|
*/
|
||||||
@Schema(description = "手机号", example = "18888888888")
|
@Schema(description = "手机号", example = "18888888888")
|
||||||
@Query
|
@Query(type = QueryType.EQ)
|
||||||
private String phone;
|
private String phone;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发送状态
|
* 发送状态
|
||||||
*/
|
*/
|
||||||
@Schema(description = "发送状态", example = "1")
|
@Schema(description = "发送状态", example = "1")
|
||||||
@Query
|
@Query(type = QueryType.EQ)
|
||||||
private SuccessFailureStatusEnum status;
|
private SuccessFailureStatusEnum status;
|
||||||
}
|
}
|
@@ -50,11 +50,13 @@ public class StorageQuery implements Serializable {
|
|||||||
* 状态
|
* 状态
|
||||||
*/
|
*/
|
||||||
@Schema(description = "状态", example = "1")
|
@Schema(description = "状态", example = "1")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private DisEnableStatusEnum status;
|
private DisEnableStatusEnum status;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类型
|
* 类型
|
||||||
*/
|
*/
|
||||||
@Schema(description = "类型", example = "2")
|
@Schema(description = "类型", example = "2")
|
||||||
|
@Query(type = QueryType.EQ)
|
||||||
private StorageTypeEnum type;
|
private StorageTypeEnum type;
|
||||||
}
|
}
|
@@ -36,7 +36,7 @@ import top.continew.admin.system.model.resp.DeptResp;
|
|||||||
import top.continew.admin.system.service.DeptService;
|
import top.continew.admin.system.service.DeptService;
|
||||||
import top.continew.starter.excel.converter.ExcelBaseEnumConverter;
|
import top.continew.starter.excel.converter.ExcelBaseEnumConverter;
|
||||||
import top.continew.starter.excel.converter.ExcelListConverter;
|
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.io.Serial;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
@@ -290,7 +290,8 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// user/avatar/ => user、avatar
|
// user/avatar/ => 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;
|
String lastPath = StringConstants.SLASH;
|
||||||
StringBuilder currentPathBuilder = new StringBuilder();
|
StringBuilder currentPathBuilder = new StringBuilder();
|
||||||
for (int i = 0; i < parentPathParts.length; i++) {
|
for (int i = 0; i < parentPathParts.length; i++) {
|
||||||
|
@@ -80,10 +80,10 @@ import top.continew.starter.core.exception.BusinessException;
|
|||||||
import top.continew.starter.core.util.CollUtils;
|
import top.continew.starter.core.util.CollUtils;
|
||||||
import top.continew.starter.core.util.FileUploadUtils;
|
import top.continew.starter.core.util.FileUploadUtils;
|
||||||
import top.continew.starter.core.util.validation.CheckUtils;
|
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.PageQuery;
|
||||||
import top.continew.starter.extension.crud.model.query.SortQuery;
|
import top.continew.starter.extension.crud.model.query.SortQuery;
|
||||||
import top.continew.starter.extension.crud.model.resp.PageResp;
|
import top.continew.starter.extension.crud.model.resp.PageResp;
|
||||||
import top.continew.starter.security.crypto.util.EncryptHelper;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
|
2
pom.xml
2
pom.xml
@@ -13,7 +13,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>top.continew.starter</groupId>
|
<groupId>top.continew.starter</groupId>
|
||||||
<artifactId>continew-starter</artifactId>
|
<artifactId>continew-starter</artifactId>
|
||||||
<version>2.13.4</version>
|
<version>2.14.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>top.continew.admin</groupId>
|
<groupId>top.continew.admin</groupId>
|
||||||
|
Reference in New Issue
Block a user