From e8affeca5174c8cea23e71cb5768ee11fc0bd1e4 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Sun, 18 Dec 2022 12:50:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/{ => common}/enums/DataScopeEnum.java | 2 +- .../system/{ => common}/enums/GenderEnum.java | 2 +- .../system/{ => common}/enums/MenuTypeEnum.java | 2 +- .../system/{ => common}/enums/StatusEnum.java | 2 +- .../common/exception/GlobalExceptionHandler.java | 8 +++----- .../system/{ => common}/util/ResponseUtils.java | 3 +-- .../com/youlai/system/config/SecurityConfig.java | 2 +- .../com/youlai/system/converter/UserConverter.java | 2 +- .../system/handler/MyDataPermissionHandler.java | 14 +++++++------- .../java/com/youlai/system/pojo/bo/RouteBO.java | 2 +- .../com/youlai/system/pojo/vo/menu/MenuVO.java | 2 +- .../security/exception/MyAccessDeniedHandler.java | 2 +- .../exception/MyAuthenticationEntryPoint.java | 2 +- .../system/{ => security}/util/SecurityUtils.java | 2 +- .../system/service/impl/MinioServiceImpl.java | 6 ++++++ .../system/service/impl/SysDeptServiceImpl.java | 2 +- .../system/service/impl/SysMenuServiceImpl.java | 4 ++-- .../system/service/impl/SysRoleServiceImpl.java | 2 +- .../system/service/impl/SysUserServiceImpl.java | 4 ++-- src/main/resources/mapper/SysMenuMapper.xml | 4 ++-- 20 files changed, 36 insertions(+), 33 deletions(-) rename src/main/java/com/youlai/system/{ => common}/enums/DataScopeEnum.java (93%) rename src/main/java/com/youlai/system/{ => common}/enums/GenderEnum.java (91%) rename src/main/java/com/youlai/system/{ => common}/enums/MenuTypeEnum.java (94%) rename src/main/java/com/youlai/system/{ => common}/enums/StatusEnum.java (91%) rename src/main/java/com/youlai/system/{ => common}/util/ResponseUtils.java (95%) rename src/main/java/com/youlai/system/{ => security}/util/SecurityUtils.java (98%) diff --git a/src/main/java/com/youlai/system/enums/DataScopeEnum.java b/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java similarity index 93% rename from src/main/java/com/youlai/system/enums/DataScopeEnum.java rename to src/main/java/com/youlai/system/common/enums/DataScopeEnum.java index d2dd732f..f9e35f1b 100644 --- a/src/main/java/com/youlai/system/enums/DataScopeEnum.java +++ b/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.system.common.enums; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/enums/GenderEnum.java b/src/main/java/com/youlai/system/common/enums/GenderEnum.java similarity index 91% rename from src/main/java/com/youlai/system/enums/GenderEnum.java rename to src/main/java/com/youlai/system/common/enums/GenderEnum.java index d8e5ed04..0b294975 100644 --- a/src/main/java/com/youlai/system/enums/GenderEnum.java +++ b/src/main/java/com/youlai/system/common/enums/GenderEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.system.common.enums; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/enums/MenuTypeEnum.java b/src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java similarity index 94% rename from src/main/java/com/youlai/system/enums/MenuTypeEnum.java rename to src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java index 05fa6b0e..7767ffa0 100644 --- a/src/main/java/com/youlai/system/enums/MenuTypeEnum.java +++ b/src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.system.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.youlai.system.common.base.IBaseEnum; diff --git a/src/main/java/com/youlai/system/enums/StatusEnum.java b/src/main/java/com/youlai/system/common/enums/StatusEnum.java similarity index 91% rename from src/main/java/com/youlai/system/enums/StatusEnum.java rename to src/main/java/com/youlai/system/common/enums/StatusEnum.java index d333bbab..6caa2610 100644 --- a/src/main/java/com/youlai/system/enums/StatusEnum.java +++ b/src/main/java/com/youlai/system/common/enums/StatusEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.system.common.enums; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java b/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java index 8dcf5f01..0d87d9c1 100644 --- a/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java @@ -28,12 +28,11 @@ import java.util.stream.Collectors; /** * 全局系统异常处理 + * * 调整异常处理的HTTP状态码，丰富异常处理类型 * - * @author hxrui * @author Gadfly * @date 2020-02-25 13:54 - *

**/ @RestControllerAdvice @Slf4j @@ -166,12 +165,10 @@ public class GlobalExceptionHandler { } - - @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(BusinessException.class) public Result handleBizException(BusinessException e) { - log.error("业务异常，异常原因：{}", e.getMessage(), e); + log.error("biz exception,{}", e.getMessage()); if (e.getResultCode() != null) { return Result.failed(e.getResultCode()); } @@ -181,6 +178,7 @@ public class GlobalExceptionHandler { @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(Exception.class) public Result handleException(Exception e) { + log.error("unknown exception, {}", e.getMessage()); return Result.failed(e.getLocalizedMessage()); } diff --git a/src/main/java/com/youlai/system/util/ResponseUtils.java b/src/main/java/com/youlai/system/common/util/ResponseUtils.java similarity index 95% rename from src/main/java/com/youlai/system/util/ResponseUtils.java rename to src/main/java/com/youlai/system/common/util/ResponseUtils.java index e2ac13df..458f7721 100644 --- a/src/main/java/com/youlai/system/util/ResponseUtils.java +++ b/src/main/java/com/youlai/system/common/util/ResponseUtils.java @@ -1,4 +1,4 @@ -package com.youlai.system.util; +package com.youlai.system.common.util; import cn.hutool.json.JSONUtil; import com.youlai.system.common.result.Result; @@ -8,7 +8,6 @@ import org.springframework.http.MediaType; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.PrintWriter; /** * response 响应工具类 diff --git a/src/main/java/com/youlai/system/config/SecurityConfig.java b/src/main/java/com/youlai/system/config/SecurityConfig.java index 6b02dbdc..7df9e20a 100644 --- a/src/main/java/com/youlai/system/config/SecurityConfig.java +++ b/src/main/java/com/youlai/system/config/SecurityConfig.java @@ -3,7 +3,7 @@ package com.youlai.system.config; import com.youlai.system.security.filter.JwtAuthenticationFilter; import com.youlai.system.security.exception.MyAccessDeniedHandler; import com.youlai.system.security.exception.MyAuthenticationEntryPoint; -import com.youlai.system.security.jwt.JwtTokenManager; +import com.youlai.system.security.JwtTokenManager; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/system/converter/UserConverter.java b/src/main/java/com/youlai/system/converter/UserConverter.java index 9f610acf..e11be797 100644 --- a/src/main/java/com/youlai/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/system/converter/UserConverter.java @@ -22,7 +22,7 @@ import org.mapstruct.Mappings; public interface UserConverter { @Mappings({ - @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(po.getGender(), com.youlai.system.enums.GenderEnum.class))") + @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(po.getGender(), com.youlai.system.common.enums.GenderEnum.class))") }) UserVO po2Vo(UserBO po); diff --git a/src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java b/src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java index a188397d..ffee4bd0 100644 --- a/src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java +++ b/src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; import com.youlai.system.common.annotation.DataPermission; import com.youlai.system.common.base.IBaseEnum; -import com.youlai.system.enums.DataScopeEnum; -import com.youlai.system.util.SecurityUtils; +import com.youlai.system.common.enums.DataScopeEnum; +import com.youlai.system.security.util.SecurityUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; @@ -55,7 +55,7 @@ public class MyDataPermissionHandler implements DataPermissionHandler { public static Expression dataScopeFilter(String deptAlias, String deptIdColumnName, String userAlias, String userIdColumnName, Expression where) { - String deptColumnName = StrUtil.isNotBlank(deptAlias) ? (deptAlias +StringPool.DOT+ deptIdColumnName) : deptIdColumnName; + String deptColumnName = StrUtil.isNotBlank(deptAlias) ? (deptAlias + StringPool.DOT + deptIdColumnName) : deptIdColumnName; String userColumnName = StrUtil.isNotBlank(userAlias) ? (userAlias + StringPool.DOT + userIdColumnName) : userIdColumnName; // 获取当前用户的数据权限 @@ -70,11 +70,11 @@ public class MyDataPermissionHandler implements DataPermissionHandler { return where; case DEPT: deptId = SecurityUtils.getDeptId(); - appendSqlStr = deptColumnName + StringPool.EQUALS+ deptId; + appendSqlStr = deptColumnName + StringPool.EQUALS + deptId; break; case SELF: userId = SecurityUtils.getUserId(); - appendSqlStr = userColumnName + StringPool.EQUALS + userId; + appendSqlStr = userColumnName + StringPool.EQUALS + userId; break; // 默认部门及子部门数据权限 default: @@ -87,9 +87,9 @@ public class MyDataPermissionHandler implements DataPermissionHandler { return where; } - Expression appendExpression =CCJSqlParserUtil.parseCondExpression(appendSqlStr); + Expression appendExpression = CCJSqlParserUtil.parseCondExpression(appendSqlStr); - if(where==null){ + if (where == null) { return appendExpression; } diff --git a/src/main/java/com/youlai/system/pojo/bo/RouteBO.java b/src/main/java/com/youlai/system/pojo/bo/RouteBO.java index 725e4b1a..2af90dc2 100644 --- a/src/main/java/com/youlai/system/pojo/bo/RouteBO.java +++ b/src/main/java/com/youlai/system/pojo/bo/RouteBO.java @@ -2,7 +2,7 @@ package com.youlai.system.pojo.bo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.system.common.enums.MenuTypeEnum; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java b/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java index 7738f011..b4f35cb2 100644 --- a/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java +++ b/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java @@ -1,7 +1,7 @@ package com.youlai.system.pojo.vo.menu; import com.fasterxml.jackson.annotation.JsonInclude; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.system.common.enums.MenuTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java index 34795ea2..f8a9c005 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java +++ b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java @@ -1,7 +1,7 @@ package com.youlai.system.security.exception; import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.system.common.util.ResponseUtils; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java index 96ff8f7a..1b03f904 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ package com.youlai.system.security.exception; import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.system.common.util.ResponseUtils; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/youlai/system/util/SecurityUtils.java b/src/main/java/com/youlai/system/security/util/SecurityUtils.java similarity index 98% rename from src/main/java/com/youlai/system/util/SecurityUtils.java rename to src/main/java/com/youlai/system/security/util/SecurityUtils.java index d2eb3a9b..84b481bd 100644 --- a/src/main/java/com/youlai/system/util/SecurityUtils.java +++ b/src/main/java/com/youlai/system/security/util/SecurityUtils.java @@ -1,4 +1,4 @@ -package com.youlai.system.util; +package com.youlai.system.security.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; diff --git a/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java b/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java index 176b7957..3d3460d7 100644 --- a/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java @@ -21,6 +21,12 @@ import java.io.InputStream; import java.time.LocalDateTime; +/** + * MinIO 文件实现类 + * + * @author haoxr + * @date 2022/12/17 + */ @Component @ConfigurationProperties(prefix = "minio") @Slf4j diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java index 4b69ae33..7554cd1e 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java @@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.enums.StatusEnum; +import com.youlai.system.common.enums.StatusEnum; import com.youlai.system.pojo.Option; import com.youlai.system.converter.DeptConverter; import com.youlai.system.mapper.SysDeptMapper; diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java index cf49800e..c662b777 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.enums.MenuTypeEnum; -import com.youlai.system.enums.StatusEnum; +import com.youlai.system.common.enums.MenuTypeEnum; +import com.youlai.system.common.enums.StatusEnum; import com.youlai.system.pojo.Option; import com.youlai.system.converter.MenuConverter; import com.youlai.system.mapper.SysMenuMapper; diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java index b9435e59..cae04593 100644 --- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java @@ -20,7 +20,7 @@ import com.youlai.system.pojo.vo.role.RolePageVO; import com.youlai.system.service.SysRoleMenuService; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; -import com.youlai.system.util.SecurityUtils; +import com.youlai.system.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java index abfc15f4..fe2bee9d 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java @@ -16,7 +16,7 @@ import com.google.common.collect.Lists; import com.youlai.system.common.base.IBaseEnum; import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.converter.UserConverter; -import com.youlai.system.enums.GenderEnum; +import com.youlai.system.common.enums.GenderEnum; import com.youlai.system.listener.UserImportListener; import com.youlai.system.mapper.SysUserMapper; import com.youlai.system.pojo.bo.UserBO; @@ -34,7 +34,7 @@ import com.youlai.system.service.SysMenuService; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; import com.youlai.system.service.SysUserService; -import com.youlai.system.util.SecurityUtils; +import com.youlai.system.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index aaeb3bf3..8ed68d9e 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -40,7 +40,7 @@ LEFT JOIN sys_role_menu t2 ON t1.id = t2.menu_id LEFT JOIN sys_role t3 ON t2.role_id = t3.id WHERE - t1.type != '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}' + t1.type != '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' ORDER BY t1.sort asc @@ -53,7 +53,7 @@ INNER JOIN sys_role_menu t2 INNER JOIN sys_role t3 WHERE - t1.type = '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}' + t1.type = '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' AND t1.perm IS NOT NULL