ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-13 02:57:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: continew-starter 2.5.2 => 2.6.0

Browse Source 
修复更新加密失效
修复特殊校验异常不打印堆栈
其他优化

Closes #84
This commit is contained in:
Charles7c
2024-09-07 19:00:06 +08:00
parent 098571ffb2
commit c87317d199
46 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-common/pom.xml
View File

@@ -67,7 +67,7 @@
<!-- ContiNew Starter 数据访问模块 - MyBatis Plus -->
<dependency>
<groupId>top.continew</groupId>
<artifactId>continew-starter-data-mybatis-plus</artifactId>
<artifactId>continew-starter-data-mp</artifactId>
</dependency>
<!-- ContiNew Starter 缓存模块 - JetCache -->

6
continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java
View File

@@ -45,7 +45,7 @@ public class GlobalExceptionHandler {
*/
@ExceptionHandler(BusinessException.class)
public R handleBusinessException(BusinessException e, HttpServletRequest request) {
log.error("请求地址 [{}]，发生业务异常。", request.getRequestURI(), e);
log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e);
return R.fail(String.valueOf(HttpStatus.INTERNAL_SERVER_ERROR.value()), e.getMessage());
}
@@ -54,7 +54,7 @@ public class GlobalExceptionHandler {
*/
@ExceptionHandler(BadRequestException.class)
public R handleBadRequestException(BadRequestException e, HttpServletRequest request) {
log.error("请求地址 [{}]，自定义验证失败。", request.getRequestURI(), e);
log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e);
return R.fail(String.valueOf(HttpStatus.BAD_REQUEST.value()), e.getMessage());
}
@@ -63,6 +63,7 @@ public class GlobalExceptionHandler {
*/
@ExceptionHandler(MultipartException.class)
public R handleRequestTooBigException(MultipartException e, HttpServletRequest request) {
log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e);
String msg = e.getMessage();
R defaultFail = R.fail(String.valueOf(HttpStatus.BAD_REQUEST.value()), msg);
if (CharSequenceUtil.isBlank(msg)) {
@@ -81,7 +82,6 @@ public class GlobalExceptionHandler {
return defaultFail;
}
String errorMsg = "请上传小于 %sKB 的文件".formatted(NumberUtil.parseLong(sizeLimit) / 1024);
log.error("请求地址 [{}]，上传文件失败，文件大小超过限制。", request.getRequestURI(), e);
return R.fail(String.valueOf(HttpStatus.BAD_REQUEST.value()), errorMsg);
}
}

6
continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java
View File

@@ -43,7 +43,7 @@ public class GlobalSaTokenExceptionHandler {
*/
@ExceptionHandler(NotLoginException.class)
public R handleNotLoginException(NotLoginException e, HttpServletRequest request) {
log.error("请求地址 [{}]，认证失败，无法访问系统资源。", request.getRequestURI(), e);
log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e);
String errorMsg = switch (e.getType()) {
case NotLoginException.KICK_OUT -> "您已被踢下线";
case NotLoginException.BE_REPLACED_MESSAGE -> "您已被顶下线";
@@ -57,7 +57,7 @@ public class GlobalSaTokenExceptionHandler {
*/
@ExceptionHandler(NotPermissionException.class)
public R handleNotPermissionException(NotPermissionException e, HttpServletRequest request) {
log.error("请求地址 [{}]，权限码校验失败。", request.getRequestURI(), e);
log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e);
return R.fail(String.valueOf(HttpStatus.FORBIDDEN.value()), "没有访问权限，请联系管理员授权");
}
@@ -66,7 +66,7 @@ public class GlobalSaTokenExceptionHandler {
*/
@ExceptionHandler(NotRoleException.class)
public R handleNotRoleException(NotRoleException e, HttpServletRequest request) {
log.error("请求地址 [{}]，角色权限校验失败。", request.getRequestURI(), e);
log.error("[{}] {}", request.getMethod(), request.getRequestURI(), e);
return R.fail(String.valueOf(HttpStatus.FORBIDDEN.value()), "没有访问权限，请联系管理员授权");
}
}

6
continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java
View File

@@ -19,9 +19,9 @@ package top.continew.admin.common.config.mybatis;
import cn.hutool.core.convert.Convert;
import top.continew.admin.common.model.dto.LoginUser;
import top.continew.admin.common.util.helper.LoginHelper;
import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionCurrentUser;
import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter;
import top.continew.starter.data.mybatis.plus.datapermission.DataScope;
import top.continew.starter.data.mp.datapermission.DataPermissionCurrentUser;
import top.continew.starter.data.mp.datapermission.DataPermissionFilter;
import top.continew.starter.data.mp.datapermission.DataScope;
import java.util.stream.Collectors;

4
continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java
View File

@@ -20,8 +20,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import top.continew.starter.data.mybatis.plus.base.BaseMapper;
import top.continew.starter.data.mybatis.plus.datapermission.DataPermission;
import top.continew.starter.data.mp.base.BaseMapper;
import top.continew.starter.data.mp.datapermission.DataPermission;
import java.util.List;

2
continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java
View File

@@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.crypto.password.PasswordEncoder;
import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter;
import top.continew.starter.data.mp.datapermission.DataPermissionFilter;
/**
* MyBatis Plus 配置