From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java | 50 +++++++++++++-------------------------------------
1 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
index 5f97a3b..13c0d2f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
@@ -2,14 +2,17 @@
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
+import lombok.*;
/**
* 鍩虹寮傚父
*
* @author ruoyi
*/
-public class BaseException extends RuntimeException
-{
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class BaseException extends RuntimeException {
private static final long serialVersionUID = 1L;
/**
@@ -32,66 +35,39 @@
*/
private String defaultMessage;
- public BaseException(String module, String code, Object[] args, String defaultMessage)
- {
+ public BaseException(String module, String code, Object[] args, String defaultMessage) {
this.module = module;
this.code = code;
this.args = args;
this.defaultMessage = defaultMessage;
}
- public BaseException(String module, String code, Object[] args)
- {
+ public BaseException(String module, String code, Object[] args) {
this(module, code, args, null);
}
- public BaseException(String module, String defaultMessage)
- {
+ public BaseException(String module, String defaultMessage) {
this(module, null, null, defaultMessage);
}
- public BaseException(String code, Object[] args)
- {
+ public BaseException(String code, Object[] args) {
this(null, code, args, null);
}
- public BaseException(String defaultMessage)
- {
+ public BaseException(String defaultMessage) {
this(null, null, null, defaultMessage);
}
@Override
- public String getMessage()
- {
+ public String getMessage() {
String message = null;
- if (!StringUtils.isEmpty(code))
- {
+ if (!StringUtils.isEmpty(code)) {
message = MessageUtils.message(code, args);
}
- if (message == null)
- {
+ if (message == null) {
message = defaultMessage;
}
return message;
}
- public String getModule()
- {
- return module;
- }
-
- public String getCode()
- {
- return code;
- }
-
- public Object[] getArgs()
- {
- return args;
- }
-
- public String getDefaultMessage()
- {
- return defaultMessage;
- }
}
--
Gitblit v1.9.3