From e49376dfc690f6e2f3f7f5c8fedf67ca3009798e Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 26 Jul 2018 12:37:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/constant/CommonMap.java | 4 +- .../com/ruoyi/common/constant/Constants.java | 8 ++-- .../common/constant/PermissionConstants.java | 24 +++++++++++ .../file/InvalidExtensionException.java | 3 +- .../com/ruoyi/common/utils/AddressUtils.java | 2 +- .../com/ruoyi/common/utils/StringUtils.java | 2 +- .../com/ruoyi/common/utils/poi/ExcelUtil.java | 4 +- .../utils/security/PermissionUtils.java | 42 +++++++++++++++++++ .../aspectj/lang/annotation/Excel.java | 2 +- .../shiro/web/filter/LogoutFilter.java | 2 +- .../SpringSessionValidationScheduler.java | 4 +- .../exception/DefaultExceptionHandler.java | 4 +- .../framework/web/page/TableSupport.java | 8 ++-- .../monitor/job/util/ScheduleUtils.java | 18 ++++---- .../user/controller/ProfileController.java | 2 +- 15 files changed, 96 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/ruoyi/common/constant/PermissionConstants.java create mode 100644 src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java diff --git a/src/main/java/com/ruoyi/common/constant/CommonMap.java b/src/main/java/com/ruoyi/common/constant/CommonMap.java index 59059f8c..3295ffe9 100644 --- a/src/main/java/com/ruoyi/common/constant/CommonMap.java +++ b/src/main/java/com/ruoyi/common/constant/CommonMap.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; /** - * 通用Map数据 + * 通用数据库映射Map数据 * * @author ruoyi */ @@ -39,7 +39,7 @@ public class CommonMap javaTypeMap.put("text", "String"); javaTypeMap.put("mediumtext", "String"); javaTypeMap.put("longtext", "String"); - javaTypeMap.put("time", "Date"); + javaTypeMap.put("time", "Date"); javaTypeMap.put("date", "Date"); javaTypeMap.put("datetime", "Date"); javaTypeMap.put("timestamp", "Date"); diff --git a/src/main/java/com/ruoyi/common/constant/Constants.java b/src/main/java/com/ruoyi/common/constant/Constants.java index 69dd9b9f..3fdf7551 100644 --- a/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/src/main/java/com/ruoyi/common/constant/Constants.java @@ -45,21 +45,21 @@ public class Constants /** * 当前记录起始索引 */ - public static String PAGENUM = "pageNum"; + public static String PAGE_NUM = "pageNum"; /** * 每页显示记录数 */ - public static String PAGESIZE = "pageSize"; + public static String PAGE_SIZE = "pageSize"; /** * 排序列 */ - public static String ORDERBYCOLUMN = "orderByColumn"; + public static String ORDER_BY_COLUMN = "orderByColumn"; /** * 排序的方向 "desc" 或者 "asc". */ - public static String ISASC = "isAsc"; + public static String IS_ASC = "isAsc"; } diff --git a/src/main/java/com/ruoyi/common/constant/PermissionConstants.java b/src/main/java/com/ruoyi/common/constant/PermissionConstants.java new file mode 100644 index 00000000..b9544993 --- /dev/null +++ b/src/main/java/com/ruoyi/common/constant/PermissionConstants.java @@ -0,0 +1,24 @@ +package com.ruoyi.common.constant; + +/** + * 权限通用常量 + * + * @author ruoyi + */ +public class PermissionConstants +{ + /** 新增权限 */ + public static final String ADD_PERMISSION = "add"; + + /** 修改权限 */ + public static final String EDIT_PERMISSION = "edit"; + + /** 删除权限 */ + public static final String REMOVE_PERMISSION = "remove"; + + /** 显示权限 */ + public static final String VIEW_PERMISSION = "view"; + + /** 查询权限 */ + public static final String LIST_PERMISSION = "list"; +} diff --git a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java index 7f01f624..4c99c99c 100644 --- a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java @@ -19,8 +19,7 @@ public class InvalidExtensionException extends FileUploadException public InvalidExtensionException(String[] allowedExtension, String extension, String filename) { - super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" - + Arrays.toString(allowedExtension) + "]"); + super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]"); this.allowedExtension = allowedExtension; this.extension = extension; this.filename = filename; diff --git a/src/main/java/com/ruoyi/common/utils/AddressUtils.java b/src/main/java/com/ruoyi/common/utils/AddressUtils.java index 22295a4d..83d4ebac 100644 --- a/src/main/java/com/ruoyi/common/utils/AddressUtils.java +++ b/src/main/java/com/ruoyi/common/utils/AddressUtils.java @@ -30,7 +30,7 @@ public class AddressUtils } catch (Exception e) { - log.error("根据IP获取所在位置----------错误消息：" + e.getMessage()); + log.error("获取地理位置异常:", e); } return address; } diff --git a/src/main/java/com/ruoyi/common/utils/StringUtils.java b/src/main/java/com/ruoyi/common/utils/StringUtils.java index e4c44e4c..032a2fdc 100644 --- a/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -12,7 +12,7 @@ import com.ruoyi.common.support.StrFormatter; * * @author ruoyi */ -public class StringUtils +public class StringUtils extends org.apache.commons.lang3.StringUtils { /** 空字符串 */ private static final String NULLSTR = ""; diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index df46cea3..607428d3 100644 --- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -304,7 +304,7 @@ public class ExcelUtil } catch (Exception e) { - log.error("导出Excel失败{}", e); + log.error("导出Excel失败{}", e.getMessage()); } } } @@ -319,7 +319,7 @@ public class ExcelUtil } catch (Exception e) { - log.error("关闭flush失败{}", e); + log.error("关闭flush失败{}", e.getMessage()); return AjaxResult.error("导出Excel失败，请联系网站管理员！"); } } diff --git a/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java b/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java new file mode 100644 index 00000000..5c9d0abc --- /dev/null +++ b/src/main/java/com/ruoyi/common/utils/security/PermissionUtils.java @@ -0,0 +1,42 @@ +package com.ruoyi.common.utils.security; + +import org.apache.commons.lang3.StringUtils; +import com.ruoyi.common.constant.PermissionConstants; +import com.ruoyi.common.utils.MessageUtils; + +/** + * permission 工具类 + * + * @author ruoyi + */ +public class PermissionUtils +{ + /** + * 权限错误消息提醒 + * + * @param errorMsg 错误信息 + * @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.endsWithAny(permission, new String[] { PermissionConstants.VIEW_PERMISSION, PermissionConstants.LIST_PERMISSION })) + { + msg = MessageUtils.message("no.view.permission", permission); + } + return msg; + } +} diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java index b089a124..aabe3bc7 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java +++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * 自定义注解 + * 自定义导出Excel数据注解 * * @author ruoyi */ diff --git a/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java index 375b21f7..627a4a4d 100644 --- a/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java @@ -64,7 +64,7 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter } catch (Exception e) { - log.debug("Encountered session exception during logout. This can generally safely be ignored.", e); + log.error("Encountered session exception during logout. This can generally safely be ignored.", e); } return false; } diff --git a/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java b/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java index dd037528..cce436ab 100644 --- a/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java +++ b/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java @@ -121,9 +121,7 @@ public class SpringSessionValidationScheduler implements SessionValidationSchedu { if (log.isErrorEnabled()) { - log.error( - "Error starting the Spring Scheduler session validation job. Session validation may not occur.", - e); + log.error("Error starting the Spring Scheduler session validation job. Session validation may not occur.", e); } } } diff --git a/src/main/java/com/ruoyi/framework/web/exception/DefaultExceptionHandler.java b/src/main/java/com/ruoyi/framework/web/exception/DefaultExceptionHandler.java index 1570b05e..e0ee48a7 100644 --- a/src/main/java/com/ruoyi/framework/web/exception/DefaultExceptionHandler.java +++ b/src/main/java/com/ruoyi/framework/web/exception/DefaultExceptionHandler.java @@ -6,8 +6,8 @@ import org.slf4j.LoggerFactory; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; - import com.ruoyi.common.exception.DemoModeException; +import com.ruoyi.common.utils.security.PermissionUtils; import com.ruoyi.framework.web.domain.AjaxResult; /** @@ -27,7 +27,7 @@ public class DefaultExceptionHandler public AjaxResult handleAuthorizationException(AuthorizationException e) { log.error(e.getMessage(), e); - return AjaxResult.error("您没有数据的权限，请联系管理员添加"); + return AjaxResult.error(PermissionUtils.getMsg(e.getMessage())); } /** diff --git a/src/main/java/com/ruoyi/framework/web/page/TableSupport.java b/src/main/java/com/ruoyi/framework/web/page/TableSupport.java index 61b5e052..b7530a31 100644 --- a/src/main/java/com/ruoyi/framework/web/page/TableSupport.java +++ b/src/main/java/com/ruoyi/framework/web/page/TableSupport.java @@ -16,10 +16,10 @@ public class TableSupport public static PageDomain getPageDomain() { PageDomain pageDomain = new PageDomain(); - pageDomain.setPageNum(ServletUtils.getParameterToInt(Constants.PAGENUM)); - pageDomain.setPageSize(ServletUtils.getParameterToInt(Constants.PAGESIZE)); - pageDomain.setOrderByColumn(ServletUtils.getParameter(Constants.ORDERBYCOLUMN)); - pageDomain.setIsAsc(ServletUtils.getParameter(Constants.ISASC)); + pageDomain.setPageNum(ServletUtils.getParameterToInt(Constants.PAGE_NUM)); + pageDomain.setPageSize(ServletUtils.getParameterToInt(Constants.PAGE_SIZE)); + pageDomain.setOrderByColumn(ServletUtils.getParameter(Constants.ORDER_BY_COLUMN)); + pageDomain.setIsAsc(ServletUtils.getParameter(Constants.IS_ASC)); return pageDomain; } diff --git a/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleUtils.java b/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleUtils.java index 8f0c1384..0a839326 100644 --- a/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleUtils.java +++ b/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleUtils.java @@ -54,7 +54,7 @@ public class ScheduleUtils } catch (SchedulerException e) { - log.error(e.getMessage()); + log.error("getCronTrigger 异常：", e); } return null; } @@ -89,11 +89,11 @@ public class ScheduleUtils } catch (SchedulerException e) { - log.error(e.getMessage()); + log.error("createScheduleJob 异常：", e); } catch (TaskException e) { - log.error(e.getMessage()); + log.error("createScheduleJob 异常：", e); } } @@ -129,11 +129,11 @@ public class ScheduleUtils } catch (SchedulerException e) { - log.error(e.getMessage()); + log.error("SchedulerException 异常：", e); } catch (TaskException e) { - log.error(e.getMessage()); + log.error("SchedulerException 异常：", e); } } @@ -154,7 +154,7 @@ public class ScheduleUtils } catch (SchedulerException e) { - log.error(e.getMessage()); + log.error("run 异常：", e); } return rows; } @@ -170,7 +170,7 @@ public class ScheduleUtils } catch (SchedulerException e) { - log.error(e.getMessage()); + log.error("pauseJob 异常：", e); } } @@ -185,7 +185,7 @@ public class ScheduleUtils } catch (SchedulerException e) { - log.error(e.getMessage()); + log.error("resumeJob 异常：", e); } } @@ -200,7 +200,7 @@ public class ScheduleUtils } catch (SchedulerException e) { - log.error(e.getMessage()); + log.error("deleteScheduleJob 异常：", e); } } diff --git a/src/main/java/com/ruoyi/project/system/user/controller/ProfileController.java b/src/main/java/com/ruoyi/project/system/user/controller/ProfileController.java index 3cd5c33f..c98df9a6 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/ProfileController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/ProfileController.java @@ -149,7 +149,7 @@ public class ProfileController extends BaseController } catch (Exception e) { - log.error("updateAvatar failed!", e); + log.error("修改头像失败！", e); return error(e.getMessage()); } }