diff --git a/src/main/java/neatlogic/framework/exception/runner/RunnerUrlIsNullException.java b/src/main/java/neatlogic/framework/exception/runner/RunnerUrlIsNullException.java index 9eb53d95a7860e4affa71ca5ba99267f035a69eb..4becbc1da74a7b9a52f62e47ccc85db7b3950e95 100644 --- a/src/main/java/neatlogic/framework/exception/runner/RunnerUrlIsNullException.java +++ b/src/main/java/neatlogic/framework/exception/runner/RunnerUrlIsNullException.java @@ -19,6 +19,6 @@ import neatlogic.framework.exception.core.ApiRuntimeException; public class RunnerUrlIsNullException extends ApiRuntimeException { public RunnerUrlIsNullException(Long runnerId) { - super("exception.framework.runnerurlisnullexception", runnerId); + super("nfer.runnerurlisnullexception.runnerurlisnullexception", runnerId); } } diff --git a/src/main/java/neatlogic/framework/matrix/exception/MatrixViewSqlIrregularException.java b/src/main/java/neatlogic/framework/matrix/exception/MatrixViewSqlIrregularException.java index b35b0661bdbeab8ad8c1b96428ca6b06b106e732..6621877416314d367471eaf40b2e9af1c590b214 100644 --- a/src/main/java/neatlogic/framework/matrix/exception/MatrixViewSqlIrregularException.java +++ b/src/main/java/neatlogic/framework/matrix/exception/MatrixViewSqlIrregularException.java @@ -21,10 +21,10 @@ public class MatrixViewSqlIrregularException extends ApiRuntimeException { private static final long serialVersionUID = -8248360500986046478L; public MatrixViewSqlIrregularException(Exception msg) { - super("sql 非法{0}", msg.getMessage()); + super("nfme.matrixviewsqlirregularexception.matrixviewsqlirregularexception", msg.getMessage()); } public MatrixViewSqlIrregularException() { - super("exception.framework.matrixviewsqlirregularexception.2"); + super("nfme.matrixviewsqlirregularexception.matrixviewsqlirregularexception_a"); } } diff --git a/src/main/java/neatlogic/module/framework/notify/handler/EmailNotifyHandler.java b/src/main/java/neatlogic/module/framework/notify/handler/EmailNotifyHandler.java index a547bffc0ec3533538bd8027640e41d1036d12ab..749db32a10a56d07b58e0e77cada1b6dbf9e584b 100644 --- a/src/main/java/neatlogic/module/framework/notify/handler/EmailNotifyHandler.java +++ b/src/main/java/neatlogic/module/framework/notify/handler/EmailNotifyHandler.java @@ -59,7 +59,11 @@ public class EmailNotifyHandler extends NotifyHandlerBase { sendEmail(notifyVo); return true; } catch (Exception e) { - logger.error(e.getMessage(), e); + if (e instanceof NotifyNoReceiverException) { + logger.warn(e.getMessage(), e); + } else { + logger.error(e.getMessage(), e); + } if (!(e instanceof EmailServerNotFoundException)) { if (notifyVo.getIsSendExceptionNotify() == 1) { notifyVo.setIsSendExceptionNotify(0);// 防止循环调用NotifyPolicyUtil.execute方法 @@ -115,7 +119,7 @@ public class EmailNotifyHandler extends NotifyHandlerBase { if (StringUtils.isNotBlank(user.getEmail())) { toEmailSet.add(user.getEmail()); } else { - logger.error("接收对象用户:”{}({})”没有设置邮箱地址", user.getUserName(), user.getUserId()); + logger.warn("接收对象用户:”{}({})”没有设置邮箱地址", user.getUserName(), user.getUserId()); } } if (CollectionUtils.isEmpty(toEmailSet)) {