diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java index 52a8e44b..44381e33 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -1,14 +1,14 @@ package com.ruoyi.common.utils.file; -import java.io.File; -import java.io.IOException; - -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.config.Global; import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; import com.ruoyi.common.exception.file.FileSizeLimitExceededException; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.Md5Utils; +import com.ruoyi.common.utils.security.Md5Utils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; /** * 文件上传工具类 @@ -17,6 +17,10 @@ */ public class FileUploadUtils { + private FileUploadUtils() { + throw new IllegalStateException("Utility class"); + } + /** * 默认大小 50M */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Md5Utils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Md5Utils.java rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java index 9fe77c9b..a77ff31a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Md5Utils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.utils.security; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java new file mode 100644 index 00000000..3e67c0f6 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java @@ -0,0 +1,71 @@ +package com.ruoyi.common.utils.security; + +import com.ruoyi.common.constant.PermissionConstants; +import com.ruoyi.common.utils.MessageUtils; +import org.apache.commons.lang3.StringUtils; + +/** + * permission 工具类 + * + * @author ruoyi + */ +public class PermissionUtils { + + private PermissionUtils() { + throw new IllegalStateException("Utility class"); + } + + /** + * 查看数据的权限 + */ + public static final String VIEW_PERMISSION = "no.view.permission"; + + /** + * 创建数据的权限 + */ + public static final String CREATE_PERMISSION = "no.create.permission"; + + /** + * 修改数据的权限 + */ + public static final String UPDATE_PERMISSION = "no.update.permission"; + + /** + * 删除数据的权限 + */ + public static final String DELETE_PERMISSION = "no.delete.permission"; + + /** + * 导出数据的权限 + */ + public static final String EXPORT_PERMISSION = "no.export.permission"; + + /** + * 其他数据的权限 + */ + public static final String PERMISSION = "no.permission"; + + /** + * 权限错误消息提醒 + * + * @param permissionsStr 错误信息 + * @return 提示信息 + */ + public static String getMsg(String permissionsStr) { + String permission = StringUtils.substringBetween(permissionsStr, "[", "]"); + String msg = MessageUtils.message(PERMISSION, permission); + if (StringUtils.endsWithIgnoreCase(permission, PermissionConstants.ADD_PERMISSION)) { + msg = MessageUtils.message(CREATE_PERMISSION, permission); + } else if (StringUtils.endsWithIgnoreCase(permission, PermissionConstants.EDIT_PERMISSION)) { + msg = MessageUtils.message(UPDATE_PERMISSION, permission); + } else if (StringUtils.endsWithIgnoreCase(permission, PermissionConstants.REMOVE_PERMISSION)) { + msg = MessageUtils.message(DELETE_PERMISSION, permission); + } else if (StringUtils.endsWithIgnoreCase(permission, PermissionConstants.EXPORT_PERMISSION)) { + msg = MessageUtils.message(EXPORT_PERMISSION, permission); + } else if (StringUtils.endsWithAny(permission, + PermissionConstants.VIEW_PERMISSION, PermissionConstants.LIST_PERMISSION)) { + msg = MessageUtils.message(VIEW_PERMISSION, permission); + } + return msg; + } +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/PermissionUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/PermissionUtils.java deleted file mode 100644 index 3f51d994..00000000 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/PermissionUtils.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ruoyi.framework.util; - -import com.ruoyi.common.utils.MessageUtils; -import org.apache.commons.lang3.StringUtils; -import com.ruoyi.common.constant.PermissionConstants; - -/** - * permission 工具类 - * - * @author ruoyi - */ -public class PermissionUtils { - - private PermissionUtils(){ - throw new IllegalStateException("Utility class"); - } - /** - * 权限错误消息提醒 - * - * @param permissionsStr 错误信息 - * @return - */ - public static String getMsg(String permissionsStr) { - String permission = StringUtils.substringBetween(permissionsStr, "[" , "]"); - String msg = MessageUtils.message("no.view.permission" , permission); - if (StringUtils.endsWithIgnoreCase(permission, PermissionConstants.ADD_PERMISSION)) { - msg = MessageUtils.message("no.create.permission" , permission); - } else if (StringUtils.endsWithIgnoreCase(permission, PermissionConstants.EDIT_PERMISSION)) { - msg = MessageUtils.message("no.update.permission" , permission); - } else if (StringUtils.endsWithIgnoreCase(permission, PermissionConstants.REMOVE_PERMISSION)) { - msg = MessageUtils.message("no.delete.permission" , permission); - } else if (StringUtils.endsWithIgnoreCase(permission, PermissionConstants.EXPORT_PERMISSION)) { - msg = MessageUtils.message("no.export.permission" , permission); - } else if (StringUtils.endsWithAny(permission,PermissionConstants.VIEW_PERMISSION, PermissionConstants.LIST_PERMISSION)) { - msg = MessageUtils.message("no.view.permission" , permission); - } - return msg; - } -} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java index 0c0c16bc..66b1829e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java @@ -4,7 +4,7 @@ import com.ruoyi.common.exception.BusinessException; import com.ruoyi.common.exception.DemoModeException; import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.util.PermissionUtils; +import com.ruoyi.common.utils.security.PermissionUtils; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.AuthorizationException; import org.springframework.web.HttpRequestMethodNotSupportedException; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index d3831005..17ab46c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,12 +1,12 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.exception.BusinessException; import com.ruoyi.common.support.Convert; -import com.ruoyi.common.utils.Md5Utils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.security.Md5Utils; import com.ruoyi.system.domain.*; import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.ISysConfigService; @@ -295,7 +295,7 @@ public String selectUserRoleGroup(Long userId) { for (SysRole role : list) { idsStr.append(role.getRoleName()).append(","); } - if (StringUtils.isNotEmpty(idsStr.toString())) { + if (StrUtil.isNotEmpty(idsStr.toString())) { return idsStr.substring(0, idsStr.length() - 1); } return idsStr.toString(); @@ -314,7 +314,7 @@ public String selectUserPostGroup(Long userId) { for (SysPost post : list) { idsStr.append(post.getPostName()).append(","); } - if (StringUtils.isNotEmpty(idsStr.toString())) { + if (StrUtil.isNotEmpty(idsStr.toString())) { return idsStr.substring(0, idsStr.length() - 1); } return idsStr.toString();