clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !18 from 囿于昼夜，厨房与爱/master

This commit is contained in:
囿于昼夜，厨房与爱 2020-09-17 11:42:43 +08:00 committed by Gitee
parent 15a4a5350d ee9bcd1b95
commit 78a426a687
4 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/BaseException.java
View File

@ -24,17 +24,12 @@ public class BaseException extends RuntimeException
*/
private Object[] args;
/**
* 错误消息
*/
private String defaultMessage;
public BaseException(String module, String code, Object[] args, String defaultMessage)
public BaseException(String module, String code, Object[] args, String message)
{
super(message);
this.module = module;
this.code = code;
this.args = args;
this.defaultMessage = defaultMessage;
}
public BaseException(String module, String code, Object[] args)
@ -42,9 +37,9 @@ public class BaseException extends RuntimeException
this(module, code, args, null);
}
public BaseException(String module, String defaultMessage)
public BaseException(String module, String message)
{
this(module, null, null, defaultMessage);
this(module, null, null, message);
}
public BaseException(String code, Object[] args)
@ -52,9 +47,9 @@ public class BaseException extends RuntimeException
this(null, code, args, null);
}
public BaseException(String defaultMessage)
public BaseException(String message)
{
this(null, null, null, defaultMessage);
this(null, null, null, message);
}
public String getModule()
@ -71,9 +66,4 @@ public class BaseException extends RuntimeException
{
return args;
}
public String getDefaultMessage()
{
return defaultMessage;
}
}

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java
View File

@ -9,8 +9,8 @@ public class CaptchaException extends RuntimeException
{
private static final long serialVersionUID = 1L;
public CaptchaException(String msg)
public CaptchaException(String message)
{
super(msg);
super(message);
}
}

21
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CustomException.java
View File

@ -11,29 +11,26 @@ public class CustomException extends RuntimeException
private Integer code;
private String message;
public CustomException(String message)
{
this.message = message;
super(message);
}
public CustomException(String message, Integer code)
public CustomException(Integer code, String message)
{
this.message = message;
super(message);
this.code = code;
}
public CustomException(Integer code, String message, Throwable e)
{
super(message, e);
this.code = code;
}
public CustomException(String message, Throwable e)
{
super(message, e);
this.message = message;
}
@Override
public String getMessage()
{
return message;
}
public Integer getCode()

8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
View File

@ -11,14 +11,14 @@ public class TaskException extends Exception
private Code code;
public TaskException(String msg, Code code)
public TaskException(String message, Code code)
{
this(msg, code, null);
this(message, code, null);
}
public TaskException(String msg, Code code, Exception nestedEx)
public TaskException(String message, Code code, Exception nestedEx)
{
super(msg, nestedEx);
super(message, nestedEx);
this.code = code;
}