tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 项目结构优化

Browse Source
This commit is contained in:
haoxr
2022-12-18 12:50:44 +08:00
parent 0e8e56a24a
commit e8affeca51
20 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/youlai/system/enums/DataScopeEnum.java → src/main/java/com/youlai/system/common/enums/DataScopeEnum.java
View File

@@ -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;

2
src/main/java/com/youlai/system/enums/GenderEnum.java → src/main/java/com/youlai/system/common/enums/GenderEnum.java
View File

@@ -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;

2
src/main/java/com/youlai/system/enums/MenuTypeEnum.java → src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java
View File

@@ -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;

2
src/main/java/com/youlai/system/enums/StatusEnum.java → src/main/java/com/youlai/system/common/enums/StatusEnum.java
View File

@@ -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;

8
src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java
View File

@@ -28,12 +28,11 @@ import java.util.stream.Collectors;
/**
* 全局系统异常处理
*
* 调整异常处理的HTTP状态码，丰富异常处理类型
*
* @author hxrui
* @author Gadfly
* @date 2020-02-25 13:54
* <p>
**/
@RestControllerAdvice
@Slf4j
@@ -166,12 +165,10 @@ public class GlobalExceptionHandler {
}
@ResponseStatus(HttpStatus.BAD_REQUEST)
@ExceptionHandler(BusinessException.class)
public <T> Result<T> 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 <T> Result<T> handleException(Exception e) {
log.error("unknown exception, {}", e.getMessage());
return Result.failed(e.getLocalizedMessage());
}

3
src/main/java/com/youlai/system/util/ResponseUtils.java → src/main/java/com/youlai/system/common/util/ResponseUtils.java
View File

@@ -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 响应工具类

2
src/main/java/com/youlai/system/config/SecurityConfig.java
View File

@@ -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;

2
src/main/java/com/youlai/system/converter/UserConverter.java
View File

@@ -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);

14
src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java
View File

@@ -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;
}

2
src/main/java/com/youlai/system/pojo/bo/RouteBO.java
View File

@@ -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;

2
src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java
View File

@@ -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;

2
src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java
View File

@@ -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;

2
src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java
View File

@@ -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;

2
src/main/java/com/youlai/system/util/SecurityUtils.java → src/main/java/com/youlai/system/security/util/SecurityUtils.java
View File

@@ -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;

6
src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java
View File

@@ -21,6 +21,12 @@ import java.io.InputStream;
import java.time.LocalDateTime;
/**
* MinIO 文件实现类
*
* @author haoxr
* @date 2022/12/17
*/
@Component
@ConfigurationProperties(prefix = "minio")
@Slf4j

2
src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
View File

@@ -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;

4
src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
View File

@@ -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;

2
src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
View File

@@ -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;

4
src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
View File

@@ -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;

4
src/main/resources/mapper/SysMenuMapper.xml
View File

@@ -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
</select>
@@ -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
<choose>
<when test="roles!=null and roles.size()>0">